Greg Padgett has uploaded a new change for review. Change subject: [WIP] core: rename SPMAsyncTask to AsyncTaskBase ......................................................................
[WIP] core: rename SPMAsyncTask to AsyncTaskBase Also includes renaming SPMTask interface to AsyncTask. This makes it easier for git to recognize the rename, thus making it easier to follow the history of these files. Change-Id: I18577988803369ffba4ae136e7d4fbd66fadd225 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandAsyncTask.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/AsyncTask.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/CallBack.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/TaskHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java 12 files changed, 69 insertions(+), 69 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/26911/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index f5cccf6..7e92b02 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -37,8 +37,8 @@ import org.ovirt.engine.core.bll.session.SessionDataContainer; import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.bll.tasks.interfaces.Command; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; @@ -1575,7 +1575,7 @@ * @param parentCommand The type of command issuing the task * @return An {@link SPMAsyncTask} object representing the task to be run */ - public SPMTask concreteCreateTask( + public AsyncTask concreteCreateTask( Guid taskId, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskBase.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskBase.java index 256cf04..2aba688 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskBase.java @@ -5,8 +5,8 @@ import java.util.Map; import org.ovirt.engine.core.bll.job.ExecutionHandler; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCoordinator; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.asynctasks.AsyncTaskParameters; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus; @@ -19,9 +19,9 @@ import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -public class SPMAsyncTask implements SPMTask { +public class AsyncTaskBase implements AsyncTask { CommandCoordinator coco; - public SPMAsyncTask(CommandCoordinator coco, AsyncTaskParameters parameters) { + public AsyncTaskBase(CommandCoordinator coco, AsyncTaskParameters parameters) { this.coco = coco; setParameters(parameters); setState(AsyncTaskState.Initializing); @@ -329,7 +329,7 @@ // Set to running in order to continue polling the task in case SPM hasn't loaded the tasks yet.. returnedStatusTask = new AsyncTaskStatus(AsyncTaskStatusEnum.unknown); - log.errorFormat("SPMAsyncTask::PollTask: Task '{0}' (Parent Command {1}, Parameters Type {2}) " + + log.errorFormat("AsyncTaskBase::PollTask: Task '{0}' (Parent Command {1}, Parameters Type {2}) " + "was not found in VDSM, will change its status to unknown.", getVdsmTaskId(), (getParameters().getDbAsyncTask().getaction_type()), getParameters().getClass().getName()); @@ -347,7 +347,7 @@ */ protected void AddLogStatusTask(AsyncTaskStatus cachedStatusTask) { - String formatString = "SPMAsyncTask::PollTask: Polling task '{0}' (Parent Command {1}, Parameters Type {2}) " + String formatString = "AsyncTaskBase::PollTask: Polling task '{0}' (Parent Command {1}, Parameters Type {2}) " + "returned status '{3}'{4}."; // If task doesn't exist (unknown) or has ended with failure (aborting) @@ -388,7 +388,7 @@ && getState() != AsyncTaskState.ClearFailed && !getLastTaskStatus().getTaskIsInUnusualState()) { try { log.infoFormat( - "SPMAsyncTask::StopTask: Attempting to stop task '{0}' (Parent Command {1}, Parameters Type {2}).", + "AsyncTaskBase::StopTask: Attempting to stop task '{0}' (Parent Command {1}, Parameters Type {2}).", getVdsmTaskId(), (getParameters().getDbAsyncTask().getaction_type()), getParameters().getClass().getName()); @@ -396,7 +396,7 @@ coco.stopTask(getStoragePoolID(), getVdsmTaskId()); } catch (RuntimeException e) { log.error( - String.format("SPMAsyncTask::StopTask: Stopping task '%1$s' threw an exception.", getVdsmTaskId()), + String.format("AsyncTaskBase::StopTask: Stopping task '%1$s' threw an exception.", getVdsmTaskId()), e); } finally { if (forceFinish) { @@ -425,12 +425,12 @@ VDSReturnValue vdsReturnValue = null; try { - log.infoFormat("SPMAsyncTask::ClearAsyncTask: Attempting to clear task '{0}'", getVdsmTaskId()); + log.infoFormat("AsyncTaskBase::ClearAsyncTask: Attempting to clear task '{0}'", getVdsmTaskId()); vdsReturnValue = coco.clearTask(getStoragePoolID(), getVdsmTaskId()); } catch (RuntimeException e) { - log.error(String.format("SPMAsyncTask::ClearAsyncTask: Clearing task '%1$s' threw an exception.", + log.error(String.format("AsyncTaskBase::ClearAsyncTask: Clearing task '%1$s' threw an exception.", getVdsmTaskId()), e); } @@ -461,7 +461,7 @@ if (vdsReturnValue != null && vdsReturnValue.getVdsError() != null && vdsReturnValue.getVdsError().getCode() == VdcBllErrors.TaskStateError) { log.infoFormat( - "SPMAsyncTask::ClearAsyncTask: At time of attempt to clear task '{0}' the response code was {1} and message was {2}. Task will not be cleaned", + "AsyncTaskBase::ClearAsyncTask: At time of attempt to clear task '{0}' the response code was {1} and message was {2}. Task will not be cleaned", getVdsmTaskId(), vdsReturnValue.getVdsError().getCode(), vdsReturnValue.getVdsError().getMessage()); @@ -475,10 +475,10 @@ } protected void LogTaskCleanFailure() { - log.errorFormat("SPMAsyncTask::ClearAsyncTask: Clearing task '{0}' failed.", getVdsmTaskId()); + log.errorFormat("AsyncTaskBase::ClearAsyncTask: Clearing task '{0}' failed.", getVdsmTaskId()); } - private static final Log log = LogFactory.getLog(SPMAsyncTask.class); + private static final Log log = LogFactory.getLog(AsyncTaskBase.class); private boolean partiallyCompletedCommandTask = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskFactory.java index 80bc1de..f977b1e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskFactory.java @@ -28,7 +28,7 @@ * the info by which we construct the task. * @return */ - public static SPMAsyncTask construct(CommandCoordinator coco, AsyncTaskCreationInfo creationInfo) { + public static AsyncTaskBase construct(CommandCoordinator coco, AsyncTaskCreationInfo creationInfo) { AsyncTasks asyncTask = coco.getByVdsmTaskId(creationInfo.getVdsmTaskId()); if (asyncTask == null || asyncTask.getActionParameters() == null) { Guid parentCmdId = asyncTask == null ? Guid.Empty : asyncTask.getParentCommandId(); @@ -53,7 +53,7 @@ return construct(coco, creationInfo.getTaskType(), asyncTaskParams, true); } - public static SPMAsyncTask construct(CommandCoordinator coco, AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask) { + public static AsyncTaskBase construct(CommandCoordinator coco, AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask) { AsyncTaskParameters asyncTaskParams = new AsyncTaskParameters(creationInfo, asyncTask); return construct(coco, creationInfo.getTaskType(), asyncTaskParams, true); } @@ -71,11 +71,11 @@ * the parameters by which we construct the task. * @return */ - public static SPMAsyncTask construct(CommandCoordinator coco, AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit) { + public static AsyncTaskBase construct(CommandCoordinator coco, AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit) { try { - SPMAsyncTask result = null; + AsyncTaskBase result = null; if (taskType == AsyncTaskType.unknown) { - result = new SPMAsyncTask(coco, asyncTaskParams); + result = new AsyncTaskBase(coco, asyncTaskParams); } else { result = new CommandAsyncTask(coco, asyncTaskParams, duringInit); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskManager.java index 4b638cd..29ef972 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskManager.java @@ -13,8 +13,8 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang.exception.ExceptionUtils; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCoordinator; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionType; @@ -53,7 +53,7 @@ private static final Log log = LogFactory.getLog(AsyncTaskManager.class); /** Map which consist all tasks that currently are monitored **/ - private ConcurrentMap<Guid, SPMTask> _tasks; + private ConcurrentMap<Guid, AsyncTask> _tasks; /** Indication if _tasks has changed for logging process. **/ private boolean logChangedMap = true; @@ -88,7 +88,7 @@ private AsyncTaskManager(CommandCoordinator coco) { this.coco = coco; - _tasks = new ConcurrentHashMap<Guid, SPMTask>(); + _tasks = new ConcurrentHashMap<Guid, AsyncTask>(); SchedulerUtil scheduler = SchedulerUtilQuartzImpl.getInstance(); scheduler.scheduleAFixedDelayJob(this, "_timer_Elapsed", new Class[]{}, @@ -168,7 +168,7 @@ * @return - true for uncached object , and false when the object should be * cached. */ - public synchronized boolean cachingOver(SPMTask task) { + public synchronized boolean cachingOver(AsyncTask task) { // Get time in milliseconds that the task should be cached long SubtractMinutesAsMills = TimeUnit.MINUTES .toMillis(_cacheTimeInMinutes); @@ -184,7 +184,7 @@ public synchronized boolean hasTasksByStoragePoolId(Guid storagePoolID) { boolean retVal = false; if (_tasks != null) { - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getStoragePoolID().equals(storagePoolID)) { retVal = true; break; @@ -196,7 +196,7 @@ public synchronized boolean hasTasksForEntityIdAndAction(Guid id, VdcActionType type) { if (_tasks != null) { - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (isCurrentTaskLookedFor(id, task) && type.equals(task.getParameters().getDbAsyncTask().getaction_type())) { return true; @@ -338,7 +338,7 @@ task.getTaskId(), (task.getaction_type())); AsyncTaskCreationInfo creationInfo = new AsyncTaskCreationInfo(Guid.Empty, task.getTaskType(), task.getStoragePoolId()); - SPMTask spmTask = coco.construct(creationInfo, task); + AsyncTask spmTask = coco.construct(creationInfo, task); AsyncTaskStatus failureStatus = new AsyncTaskStatus(); failureStatus.setStatus(AsyncTaskStatusEnum.finished); failureStatus.setResult(AsyncTaskResultEnum.failure); @@ -368,7 +368,7 @@ } } - private boolean isCurrentTaskLookedFor(Guid id, SPMTask task) { + private boolean isCurrentTaskLookedFor(Guid id, AsyncTask task) { return (task instanceof CommandAsyncTask) && id.equals(task.getParameters().getEntityInfo().getId()) && (task.getState() != AsyncTaskState.Cleared) && (task.getState() != AsyncTaskState.ClearFailed); @@ -377,7 +377,7 @@ private void cleanZombieTasks() { long maxTime = DateTime.getNow() .addMinutes((-1) * Config.<Integer>getValue(ConfigValues.AsyncTaskZombieTaskLifeInMinutes)).getTime(); - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getParameters().getDbAsyncTask().getStartTime().getTime() < maxTime) { AuditLogableBase logable = new AuditLogableBase(); @@ -410,7 +410,7 @@ private int numberOfTasksToPoll() { int retValue = 0; - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getShouldPoll()) { retValue++; } @@ -420,7 +420,7 @@ } private boolean thereAreTasksToPoll() { - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getShouldPoll()) { return true; } @@ -455,7 +455,7 @@ */ private void updateTaskStatuses( Map<Guid, Map<Guid, AsyncTaskStatus>> poolsAllTasksMap) { - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getShouldPoll()) { Map<Guid, AsyncTaskStatus> asyncTasksForPoolMap = poolsAllTasksMap .get(task.getStoragePoolID()); @@ -513,13 +513,13 @@ /** * Get a Set of all the storage pool id's of tasks that should pool. * - * @see SPMAsyncTask#getShouldPoll() + * @see AsyncTaskBase#getShouldPoll() * @return - Set of active tasks. */ private Set<Guid> getPoolIdsTasks() { Set<Guid> poolsOfActiveTasks = new HashSet<Guid>(); - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (task.getShouldPoll()) { poolsOfActiveTasks.add(task.getStoragePoolID()); } @@ -536,8 +536,8 @@ synchronized private void removeClearedAndOldTasks() { Set<Guid> poolsOfActiveTasks = new HashSet<Guid>(); Set<Guid> poolsOfClearedAndOldTasks = new HashSet<Guid>(); - ConcurrentMap<Guid, SPMTask> activeTaskMap = new ConcurrentHashMap<Guid, SPMTask>(); - for (SPMTask task : _tasks.values()) { + ConcurrentMap<Guid, AsyncTask> activeTaskMap = new ConcurrentHashMap<Guid, AsyncTask>(); + for (AsyncTask task : _tasks.values()) { if (!cachingOver(task)) { activeTaskMap.put(task.getVdsmTaskId(), task); poolsOfActiveTasks.add(task.getStoragePoolID()); @@ -557,11 +557,11 @@ } } - public synchronized void lockAndAddTaskToManager(SPMTask task) { + public synchronized void lockAndAddTaskToManager(AsyncTask task) { addTaskToManager(task); } - private void addTaskToManager(SPMTask task) { + private void addTaskToManager(AsyncTask task) { if (task == null) { log.error("Cannot add a null task."); } else { @@ -578,7 +578,7 @@ // quartz execution. addTaskToMap(task.getVdsmTaskId(), task); } else { - SPMTask existingTask = _tasks.get(task.getVdsmTaskId()); + AsyncTask existingTask = _tasks.get(task.getVdsmTaskId()); if (existingTask.getParameters().getDbAsyncTask().getaction_type() == VdcActionType.Unknown && task.getParameters().getDbAsyncTask().getaction_type() != VdcActionType.Unknown) { log.infoFormat( @@ -601,7 +601,7 @@ * @param guid - Key of the map. * @param asyncTask - Value of the map. */ - private void addTaskToMap(Guid guid, SPMTask asyncTask) { + private void addTaskToMap(Guid guid, AsyncTask asyncTask) { _tasks.put(guid, asyncTask); logChangedMap = true; } @@ -612,7 +612,7 @@ * * @param asyncTaskMap - Map to copy to _tasks map. */ - private void setNewMap(ConcurrentMap<Guid, SPMTask> asyncTaskMap) { + private void setNewMap(ConcurrentMap<Guid, AsyncTask> asyncTaskMap) { // If not the same set _tasks to be as asyncTaskMap. _tasks = asyncTaskMap; @@ -623,7 +623,7 @@ log.infoFormat("Setting new tasks map. The map contains now {0} tasks", _tasks.size()); } - public SPMTask createTask(AsyncTaskType taskType, AsyncTaskParameters taskParameters) { + public AsyncTask createTask(AsyncTaskType taskType, AsyncTaskParameters taskParameters) { return coco.construct(taskType, taskParameters, false); } @@ -679,13 +679,13 @@ if (currPoolTasks != null && currPoolTasks.size() > 0) { synchronized (this) { - final List<SPMTask> newlyAddedTasks = new ArrayList<SPMTask>(); + final List<AsyncTask> newlyAddedTasks = new ArrayList<AsyncTask>(); for (AsyncTaskCreationInfo creationInfo : currPoolTasks) { creationInfo.setStoragePoolID(sp.getId()); if (!_tasks.containsKey(creationInfo.getVdsmTaskId())) { try { - SPMTask task; + AsyncTask task; if (partiallyCompletedCommandTasks.containsKey(creationInfo.getVdsmTaskId())) { AsyncTasks asyncTaskInDb = partiallyCompletedCommandTasks.get(creationInfo.getVdsmTaskId()); task = coco.construct(creationInfo, asyncTaskInDb); @@ -712,14 +712,14 @@ TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { - for (SPMTask task : newlyAddedTasks) { + for (AsyncTask task : newlyAddedTasks) { AsyncTaskUtils.addOrUpdateTaskInDB(task); } return null; } }); - for (SPMTask task : newlyAddedTasks) { + for (AsyncTask task : newlyAddedTasks) { startPollingTask(task.getVdsmTaskId()); } @@ -771,7 +771,7 @@ } public synchronized boolean entityHasTasks(Guid id) { - for (SPMTask task : _tasks.values()) { + for (AsyncTask task : _tasks.values()) { if (isCurrentTaskLookedFor(id, task)) { return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java index 398ad11..d28cc54 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.businessentities.AsyncTaskEntity; import org.ovirt.engine.core.common.businessentities.AsyncTasks; @@ -29,7 +29,7 @@ * @param asyncTask * task to be added or updated */ - public static void addOrUpdateTaskInDB(final SPMTask asyncTask) { + public static void addOrUpdateTaskInDB(final AsyncTask asyncTask) { try { if (asyncTask.getParameters().getDbAsyncTask() != null) { TransactionSupport.executeInScope(TransactionScopeOption.Required, new TransactionMethod<Void>() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandAsyncTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandAsyncTask.java index e92181b..436dc13 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandAsyncTask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandAsyncTask.java @@ -25,7 +25,7 @@ /** * Base class for all tasks regarding a specific command. */ -public class CommandAsyncTask extends SPMAsyncTask { +public class CommandAsyncTask extends AsyncTaskBase { private static final Object _lockObject = new Object(); private static final Map<Guid, CommandMultiAsyncTasks> _multiTasksByCommandIds = diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java index ac46a53..8e05317 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java @@ -10,8 +10,8 @@ import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.bll.job.ExecutionContext; import org.ovirt.engine.core.bll.job.ExecutionHandler; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCoordinator; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -83,7 +83,7 @@ if (taskStep != null) { asyncTaskCreationInfo.setStepId(taskStep.getId()); } - SPMAsyncTask task = concreteCreateTask(taskId, command, asyncTaskCreationInfo, parentCommand); + AsyncTaskBase task = concreteCreateTask(taskId, command, asyncTaskCreationInfo, parentCommand); task.setEntitiesMap(entitiesMap); AsyncTaskUtils.addOrUpdateTaskInDB(task); getAsyncTaskManager().lockAndAddTaskToManager(task); @@ -244,13 +244,13 @@ } /** - * Create the {@link SPMAsyncTask} object to be run + * Create the {@link AsyncTaskBase} object to be run * @param taskId the id of the async task place holder in the database * @param asyncTaskCreationInfo Info on how to create the task * @param parentCommand The type of command issuing the task - * @return An {@link SPMAsyncTask} object representing the task to be run + * @return An {@link AsyncTaskBase} object representing the task to be run */ - public SPMAsyncTask concreteCreateTask( + public AsyncTaskBase concreteCreateTask( Guid taskId, CommandBase command, AsyncTaskCreationInfo asyncTaskCreationInfo, @@ -262,7 +262,7 @@ return createTask(internalGetTaskType(command), p); } - public SPMAsyncTask createTask(AsyncTaskType taskType, AsyncTaskParameters taskParameters) { + public AsyncTaskBase createTask(AsyncTaskType taskType, AsyncTaskParameters taskParameters) { return AsyncTaskFactory.construct(this, taskType, taskParameters, false); } @@ -400,21 +400,21 @@ } @Override - public SPMTask construct(AsyncTaskCreationInfo creationInfo) { + public AsyncTask construct(AsyncTaskCreationInfo creationInfo) { return AsyncTaskFactory.construct(this, creationInfo); } @Override - public SPMTask construct(AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask) { + public AsyncTask construct(AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask) { return AsyncTaskFactory.construct(this, creationInfo.getTaskType(), new AsyncTaskParameters(creationInfo, asyncTask), true); } @Override - public SPMTask construct(AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit) { + public AsyncTask construct(AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit) { return AsyncTaskFactory.construct(this, taskType, asyncTaskParams, duringInit); } - public VdcReturnValueBase endAction(SPMTask task, ExecutionContext context) { + public VdcReturnValueBase endAction(AsyncTask task, ExecutionContext context) { AsyncTasks dbAsyncTask = task.getParameters().getDbAsyncTask(); VdcActionType actionType = getEndActionType(dbAsyncTask); VdcActionParametersBase parameters = dbAsyncTask.getActionParameters(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java index 71275fe..c2ed84a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java @@ -63,7 +63,7 @@ entitiesMap); } - public static SPMAsyncTask concreteCreateTask( + public static AsyncTaskBase concreteCreateTask( Guid taskId, CommandBase command, AsyncTaskCreationInfo asyncTaskCreationInfo, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/SPMTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/AsyncTask.java similarity index 98% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/SPMTask.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/AsyncTask.java index 83aa26f..efaddd95 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/SPMTask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/AsyncTask.java @@ -8,7 +8,7 @@ import java.util.Map; -public interface SPMTask { +public interface AsyncTask { void concreteStartPollingTask(); void startPollingTask(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/CallBack.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/CallBack.java index a78e14d..945549e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/CallBack.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/CallBack.java @@ -4,5 +4,5 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; public interface CallBack { - public VdcReturnValueBase endAction(SPMTask task, ExecutionContext context); + public VdcReturnValueBase endAction(AsyncTask task, ExecutionContext context); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/TaskHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/TaskHelper.java index 9f863f0..7bf2d3c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/TaskHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/interfaces/TaskHelper.java @@ -8,7 +8,7 @@ import java.util.Map; import org.ovirt.engine.core.bll.CommandBase; -import org.ovirt.engine.core.bll.tasks.SPMAsyncTask; +import org.ovirt.engine.core.bll.tasks.AsyncTaskBase; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo; @@ -42,7 +42,7 @@ String description, Map<Guid, VdcObjectType> entitiesMap); - SPMAsyncTask concreteCreateTask( + AsyncTaskBase concreteCreateTask( Guid taskId, CommandBase command, AsyncTaskCreationInfo asyncTaskCreationInfo, @@ -63,10 +63,10 @@ AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand); - SPMTask construct(AsyncTaskCreationInfo creationInfo); + AsyncTask construct(AsyncTaskCreationInfo creationInfo); - SPMTask construct(AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask); + AsyncTask construct(AsyncTaskCreationInfo creationInfo, AsyncTasks asyncTask); - SPMTask construct(AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit); + AsyncTask construct(AsyncTaskType taskType, AsyncTaskParameters asyncTaskParams, boolean duringInit); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java index a893ce3..0e6e227 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java @@ -20,7 +20,7 @@ import org.junit.experimental.theories.Theories; import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; -import org.ovirt.engine.core.bll.tasks.interfaces.SPMTask; +import org.ovirt.engine.core.bll.tasks.interfaces.AsyncTask; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; import org.ovirt.engine.core.common.action.CreateCloneOfTemplateParameters; @@ -160,7 +160,7 @@ AsyncTaskCreationInfo info = nextAsyncTaskCreationInfo(); - SPMTask spmAsyncTask = cmd.concreteCreateTask(Guid.Empty, info, cmd.getParameters().getParentCommand()); + AsyncTask spmAsyncTask = cmd.concreteCreateTask(Guid.Empty, info, cmd.getParameters().getParentCommand()); assertEquals("wrong storage pool ID", info.getStoragePoolID(), spmAsyncTask.getStoragePoolID()); assertEquals("wrong task ID", info.getVdsmTaskId(), spmAsyncTask.getVdsmTaskId()); assertEquals("wrong task result", AsyncTaskResultEnum.success, spmAsyncTask.getLastTaskStatus().getResult()); -- To view, visit http://gerrit.ovirt.org/26911 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18577988803369ffba4ae136e7d4fbd66fadd225 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
