Ravi Nori has uploaded a new change for review. Change subject: engine : Rename TaskManagerUtil to CommandCoordinatorUtil ......................................................................
engine : Rename TaskManagerUtil to CommandCoordinatorUtil Rename TaskManagerUtil to CommandCoordinatorUtil Change-Id: Idf796edd6c0812dac03bbf1e71b637e9d2b452e5 Bug-Url: https://bugzilla.redhat.com/1127774 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.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 D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java 20 files changed, 67 insertions(+), 262 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/31346/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 1924261..477e496 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 @@ -35,7 +35,7 @@ import org.ovirt.engine.core.bll.quota.QuotaManager; import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.quota.QuotaVdsDependent; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.interfaces.Command; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; @@ -359,9 +359,9 @@ @Override public Void runInTransaction() { for (Guid asyncTaskId : getReturnValue().getTaskPlaceHolderIdList()) { - AsyncTasks task = TaskManagerUtil.getAsyncTaskFromDb(asyncTaskId); + AsyncTasks task = CommandCoordinatorUtil.getAsyncTaskFromDb(asyncTaskId); if (task != null && Guid.isNullOrEmpty(task.getVdsmTaskId())) { - TaskManagerUtil.removeTaskFromDbByTaskId(task.getTaskId()); + CommandCoordinatorUtil.removeTaskFromDbByTaskId(task.getTaskId()); } } @@ -1482,7 +1482,7 @@ } private void saveTaskAndPutInMap(String taskKey, AsyncTasks task) { - TaskManagerUtil.saveAsyncTaskToDb(task); + CommandCoordinatorUtil.saveAsyncTaskToDb(task); taskKeyToTaskIdMap.put(taskKey, task.getTaskId()); } @@ -1499,7 +1499,7 @@ public void deleteAsyncTaskPlaceHolder(String taskKey) { Guid taskId = taskKeyToTaskIdMap.remove(taskKey); if (!Guid.isNullOrEmpty(taskId)) { - TaskManagerUtil.removeTaskFromDbByTaskId(taskId); + CommandCoordinatorUtil.removeTaskFromDbByTaskId(taskId); } } @@ -1514,11 +1514,11 @@ return taskKeyToTaskIdMap.get(taskKey); } /** - * Use this method in order to create task in the TaskManagerUtil in a safe way. If you use this method within a + * Use this method in order to create task in the CommandCoordinatorUtil in a safe way. If you use this method within a * certain command, make sure that the command implemented the ConcreteCreateTask method. * * @param asyncTaskCreationInfo - * info to send to TaskManagerUtil when creating the task. + * info to send to CommandCoordinatorUtil when creating the task. * @param parentCommand * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param entityType @@ -1554,11 +1554,11 @@ } /** - * Use this method in order to create task in the TaskManagerUtil in a safe way. If you use this method within a + * Use this method in order to create task in the CommandCoordinatorUtil in a safe way. If you use this method within a * certain command, make sure that the command implemented the ConcreteCreateTask method. * * @param asyncTaskCreationInfo - * info to send to TaskManagerUtil when creating the task. + * info to send to CommandCoordinatorUtil when creating the task. * @param parentCommand * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param entityType @@ -1598,11 +1598,11 @@ } /** - * Use this method in order to create task in the TaskManagerUtil in a safe way. If you use this method within a + * Use this method in order to create task in the CommandCoordinatorUtil in a safe way. If you use this method within a * certain command, make sure that the command implemented the ConcreteCreateTask method. * * @param asyncTaskCreationInfo - * info to send to TaskManagerUtil when creating the task. + * info to send to CommandCoordinatorUtil when creating the task. * @param parentCommand * VdcActionType of the command that its endAction we want to invoke when tasks are finished. * @param description @@ -1648,7 +1648,7 @@ VdcActionType parentCommand, String description, Map<Guid, VdcObjectType> entitiesMap) { - return TaskManagerUtil.createTask(taskId, this, asyncTaskCreationInfo, parentCommand, description, entitiesMap); + return CommandCoordinatorUtil.createTask(taskId, this, asyncTaskCreationInfo, parentCommand, description, entitiesMap); } /** @@ -1662,7 +1662,7 @@ Guid taskId, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { - return TaskManagerUtil.concreteCreateTask(taskId, this, asyncTaskCreationInfo, parentCommand); + return CommandCoordinatorUtil.concreteCreateTask(taskId, this, asyncTaskCreationInfo, parentCommand); } public VdcActionParametersBase getParentParameters(VdcActionType parentCommand) { @@ -1676,7 +1676,7 @@ private AsyncTasks createAsyncTask( AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { - return TaskManagerUtil.createAsyncTask(this, asyncTaskCreationInfo, parentCommand); + return CommandCoordinatorUtil.createAsyncTask(this, asyncTaskCreationInfo, parentCommand); } /** @return The type of task that should be created for this command. @@ -1695,7 +1695,7 @@ protected void startPollingAsyncTasks(Collection<Guid> taskIds) { for (Guid taskID : taskIds) { - TaskManagerUtil.startPollingTask(taskID); + CommandCoordinatorUtil.startPollingTask(taskID); } } @@ -1722,11 +1722,11 @@ } private void cancelTasks() { - TaskManagerUtil.cancelTasks(this); + CommandCoordinatorUtil.cancelTasks(this); } protected void revertTasks() { - TaskManagerUtil.revertTasks(this); + CommandCoordinatorUtil.revertTasks(this); } protected EngineLock getLock() { @@ -2152,7 +2152,7 @@ public void persistCommand(VdcActionType parentCommand, CommandContext cmdContext, boolean enableCallBack) { Transaction transaction = TransactionSupport.suspend(); try { - TaskManagerUtil.persistCommand( + CommandCoordinatorUtil.persistCommand( buildCommandEntity(getParentParameters(parentCommand).getCommandId(), enableCallBack), cmdContext); @@ -2178,7 +2178,7 @@ protected void removeCommand() { Transaction transaction = TransactionSupport.suspend(); try { - TaskManagerUtil.removeCommand(getCommandId()); + CommandCoordinatorUtil.removeCommand(getCommandId()); } finally { if (transaction != null) { TransactionSupport.resume(transaction); @@ -2195,7 +2195,7 @@ if (updateDB) { Transaction transaction = TransactionSupport.suspend(); try { - TaskManagerUtil.updateCommandStatus(getCommandId(), commandStatus); + CommandCoordinatorUtil.updateCommandStatus(getCommandId(), commandStatus); } finally { if (transaction != null) { TransactionSupport.resume(transaction); @@ -2207,10 +2207,10 @@ public void setCommandExecuted() { Transaction transaction = TransactionSupport.suspend(); try { - CommandEntity cmdEntity = TaskManagerUtil.getCommandEntity(getCommandId()); + CommandEntity cmdEntity = CommandCoordinatorUtil.getCommandEntity(getCommandId()); if (cmdEntity != null) { - TaskManagerUtil.persistCommand(buildCommandEntity(cmdEntity.getRootCommandId(), cmdEntity.isCallBackEnabled()), getContext()); - TaskManagerUtil.updateCommandExecuted(getCommandId()); + CommandCoordinatorUtil.persistCommand(buildCommandEntity(cmdEntity.getRootCommandId(), cmdEntity.isCallBackEnabled()), getContext()); + CommandCoordinatorUtil.updateCommandExecuted(getCommandId()); } } finally { if (transaction != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java index dcf640c..33b7f7c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandEntityCleanupManager.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.DateTime; @@ -44,7 +44,7 @@ DateTime latestTimeToKeep = DateTime.getNow().addDays( Config.<Integer>getValue(ConfigValues.CommandEntityAgingThreshold) * -1); - TaskManagerUtil.removeAllCommandsBeforeDate(latestTimeToKeep); + CommandCoordinatorUtil.removeAllCommandsBeforeDate(latestTimeToKeep); log.info("Finished deleteAgedOutCommandEntities"); } catch (RuntimeException e) { log.error("deleteAgedOutCommandEntities failed with exception", e); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java index ddb7908..2460c49 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Date; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ImagesActionsParametersBase; import org.ovirt.engine.core.common.asynctasks.AsyncTaskType; @@ -123,7 +123,7 @@ } } catch (Exception e) { log.errorFormat("Failed creating snapshot from image id -'{0}'", getImage().getImageId()); - TaskManagerUtil.logAndFailTaskOfCommandWithEmptyVdsmId(getAsyncTaskId(), + CommandCoordinatorUtil.logAndFailTaskOfCommandWithEmptyVdsmId(getAsyncTaskId(), "Create snapshot failed at VDSM. DB task ID is " + getAsyncTaskId()); throw new VdcBLLException(VdcBllErrors.VolumeCreationError); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java index beeaaea..2cf21eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.queries.GetTasksStatusesByTasksIDsParameters; public class GetTasksStatusesByTasksIDsQuery<P extends GetTasksStatusesByTasksIDsParameters> @@ -11,6 +11,6 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(TaskManagerUtil.pollTasks(getParameters().getTasksIDs())); + getQueryReturnValue().setReturnValue(CommandCoordinatorUtil.pollTasks(getParameters().getTasksIDs())); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index f472243..2671aa2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -5,7 +5,7 @@ import java.util.Map; import org.ovirt.engine.core.bll.memory.MemoryUtils; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; @@ -252,7 +252,7 @@ return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_UP); } - if (TaskManagerUtil.entityHasTasks(getVmId())) { + if (CommandCoordinatorUtil.entityHasTasks(getVmId())) { return failCanDoAction(VdcBllMessages.VM_CANNOT_SUSPENDE_HAS_RUNNING_TASKS); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index 24f7513..a816c0f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -18,7 +18,7 @@ import org.ovirt.engine.core.bll.scheduling.MigrationHandler; import org.ovirt.engine.core.bll.scheduling.SchedulingManager; import org.ovirt.engine.core.bll.storage.StoragePoolStatusHandler; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.action.MigrateVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VDS; @@ -62,7 +62,7 @@ // Create authentication profiles for all the domains that exist in the database: // TODO: remove this later, and rely only on the custom and built in extensions directories configuration DbUserCacheManager.getInstance().init(); - TaskManagerUtil.initAsyncTaskManager(); + CommandCoordinatorUtil.initAsyncTaskManager(); ResourceManager.getInstance().init(); OvfDataUpdater.getInstance().initOvfDataUpdater(); SchedulingManager.getInstance().setMigrationHandler(new MigrationHandler() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java index 09e5635..ee8cb9e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java @@ -2,7 +2,7 @@ import java.util.List; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; import org.ovirt.engine.core.common.action.MergeParameters; import org.ovirt.engine.core.common.businessentities.VmJob; @@ -43,6 +43,6 @@ } private MergeCommand<MergeParameters> getCommand(Guid cmdId) { - return (MergeCommand<MergeParameters>) TaskManagerUtil.retrieveCommand(cmdId); + return (MergeCommand<MergeParameters>) CommandCoordinatorUtil.retrieveCommand(cmdId); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index d26874d..e280758 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -13,7 +13,7 @@ import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.storage.StoragePoolValidator; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; import org.ovirt.engine.core.bll.validator.DiskImagesValidator; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; @@ -160,7 +160,7 @@ private void removeMemory(final Snapshot snapshot, boolean useTaskManager) { RemoveMemoryVolumesParameters parameters = new RemoveMemoryVolumesParameters(snapshot.getMemoryVolume(), getVmId()); if (useTaskManager) { - TaskManagerUtil.executeAsyncCommand(VdcActionType.RemoveMemoryVolumes, parameters, cloneContextAndDetachFromParent()); + CommandCoordinatorUtil.executeAsyncCommand(VdcActionType.RemoveMemoryVolumes, parameters, cloneContextAndDetachFromParent()); } else { VdcReturnValueBase ret = runInternalAction(VdcActionType.RemoveMemoryVolumes, parameters); if (!ret.getSucceeded()) { @@ -189,7 +189,7 @@ getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } } else { - TaskManagerUtil.executeAsyncCommand( + CommandCoordinatorUtil.executeAsyncCommand( getSnapshotActionType(), buildRemoveSnapshotSingleDiskParameters(source, dest), cloneContextAndDetachFromParent()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java index 11754c7..d751ddc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java @@ -2,7 +2,7 @@ import java.util.List; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; import org.ovirt.engine.core.common.action.RemoveSnapshotParameters; import org.ovirt.engine.core.compat.CommandStatus; @@ -17,7 +17,7 @@ public void doPolling(Guid cmdId, List<Guid> childCmdIds) { boolean anyFailed = false; for (Guid childCmdId : childCmdIds) { - switch (TaskManagerUtil.getCommandStatus(childCmdId)) { + switch (CommandCoordinatorUtil.getCommandStatus(childCmdId)) { case ACTIVE: log.info("Waiting on Live Merge child commands to complete"); return; @@ -41,16 +41,16 @@ @Override public void onSucceeded(Guid cmdId, List<Guid> childCmdIds) { getCommand(cmdId).endAction(); - TaskManagerUtil.removeAllCommandsInHierarchy(cmdId); + CommandCoordinatorUtil.removeAllCommandsInHierarchy(cmdId); } @Override public void onFailed(Guid cmdId, List<Guid> childCmdIds) { getCommand(cmdId).endAction(); - TaskManagerUtil.removeAllCommandsInHierarchy(cmdId); + CommandCoordinatorUtil.removeAllCommandsInHierarchy(cmdId); } private RemoveSnapshotCommand<RemoveSnapshotParameters> getCommand(Guid cmdId) { - return (RemoveSnapshotCommand<RemoveSnapshotParameters>) TaskManagerUtil.retrieveCommand(cmdId); + return (RemoveSnapshotCommand<RemoveSnapshotParameters>) CommandCoordinatorUtil.retrieveCommand(cmdId); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java index 8dc685a..e028600 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; import org.ovirt.engine.core.common.action.DestroyImageParameters; import org.ovirt.engine.core.common.action.MergeParameters; @@ -66,7 +66,7 @@ getParameters().setChildCommands(new HashMap<RemoveSnapshotSingleDiskLiveStep, Guid>()); } - List<Guid> childCommandIds = TaskManagerUtil.getChildCommandIds(getCommandId()); + List<Guid> childCommandIds = CommandCoordinatorUtil.getChildCommandIds(getCommandId()); if (childCommandIds.size() != getParameters().getChildCommands().size()) { // Upon recovery or after invoking a new child command, our map may be missing an entry for (Guid id : childCommandIds) { @@ -81,7 +81,7 @@ VdcReturnValueBase vdcReturnValue = null; if (currentChildId != null) { - switch (TaskManagerUtil.getCommandStatus(currentChildId)) { + switch (CommandCoordinatorUtil.getCommandStatus(currentChildId)) { case ACTIVE: case NOT_STARTED: log.infoFormat("Waiting on Live Merge command step {0} to complete", @@ -89,7 +89,7 @@ return; case SUCCEEDED: - vdcReturnValue = TaskManagerUtil.getCommandReturnValue(currentChildId); + vdcReturnValue = CommandCoordinatorUtil.getCommandReturnValue(currentChildId); if (vdcReturnValue != null && vdcReturnValue.getSucceeded()) { getParameters().setCommandStep(getParameters().getNextCommandStep()); break; @@ -150,7 +150,7 @@ persistCommand(getParameters().getParentCommand(), true); if (nextCommand != null) { - TaskManagerUtil.executeAsyncCommand(nextCommand.getFirst(), nextCommand.getSecond(), cloneContextAndDetachFromParent()); + CommandCoordinatorUtil.executeAsyncCommand(nextCommand.getFirst(), nextCommand.getSecond(), cloneContextAndDetachFromParent()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java index 82fe32d..a032056 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java @@ -2,7 +2,7 @@ import java.util.List; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallBack; import org.ovirt.engine.core.common.action.RemoveSnapshotSingleDiskParameters; import org.ovirt.engine.core.compat.Guid; @@ -29,6 +29,6 @@ } private RemoveSnapshotSingleDiskLiveCommand<RemoveSnapshotSingleDiskParameters> getCommand(Guid cmdId) { - return (RemoveSnapshotSingleDiskLiveCommand<RemoveSnapshotSingleDiskParameters>) TaskManagerUtil.retrieveCommand(cmdId); + return (RemoveSnapshotSingleDiskLiveCommand<RemoveSnapshotSingleDiskParameters>) CommandCoordinatorUtil.retrieveCommand(cmdId); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index f86620f..0a584bf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -18,7 +18,7 @@ import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.storage.StoragePoolValidator; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.validator.DiskImagesValidator; import org.ovirt.engine.core.bll.validator.MultipleStorageDomainsValidator; @@ -221,7 +221,7 @@ } // If it is force, we cannot remove if there are task - if (TaskManagerUtil.hasTasksByStoragePoolId(getVm().getStoragePoolId())) { + if (CommandCoordinatorUtil.hasTasksByStoragePoolId(getVm().getStoragePoolId())) { return failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_HAS_RUNNING_TASKS); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java index 8c242c7..6821d0d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java @@ -8,7 +8,7 @@ import java.util.Map; import org.ovirt.engine.core.bll.memory.MemoryImageRemoverFromExportDomain; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; @@ -92,7 +92,7 @@ // not using getVm() since its overridden to get vm from export domain VM vm = getVmDAO().get(getVmId()); if (vm != null && vm.getStatus() == VMStatus.ImageLocked) { - if (TaskManagerUtil.hasTasksForEntityIdAndAction(vm.getId(), VdcActionType.ExportVm)) { + if (CommandCoordinatorUtil.hasTasksForEntityIdAndAction(vm.getId(), VdcActionType.ExportVm)) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_DURING_EXPORT); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java index 40ed1e4..a514e37 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java @@ -17,7 +17,7 @@ import org.ovirt.engine.core.bll.scheduling.RunVmDelayer; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.storage.StorageHelperDirector; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.RemoveVmHibernationVolumesParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -212,7 +212,7 @@ removeVmHibernationVolumesParameters); for (Guid taskId : vdcRetValue.getInternalVdsmTaskIdList()) { - TaskManagerUtil.startPollingTask(taskId); + CommandCoordinatorUtil.startPollingTask(taskId); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 4fd7c4d..197c557 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -20,7 +20,7 @@ import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.scheduling.SchedulingManager; import org.ovirt.engine.core.bll.storage.StoragePoolStatusHandler; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; import org.ovirt.engine.core.common.action.ConnectHostToStoragePoolServersParameters; @@ -396,7 +396,7 @@ @Override public void storagePoolUpEvent(StoragePool storagePool) { - TaskManagerUtil.addStoragePoolExistingTasks(storagePool); + CommandCoordinatorUtil.addStoragePoolExistingTasks(storagePool); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 1af13b1..0b6baec 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.network.MacPoolManager; import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.validator.MultipleStorageDomainsValidator; import org.ovirt.engine.core.common.FeatureSupported; @@ -359,7 +359,7 @@ if (!vdsRetValue.getSucceeded()) { if (startPollingTasks) { - TaskManagerUtil.startPollingTask(guid1); + CommandCoordinatorUtil.startPollingTask(guid1); } return false; } @@ -368,8 +368,8 @@ getTaskIdList().add(guid2); if (startPollingTasks) { - TaskManagerUtil.startPollingTask(guid1); - TaskManagerUtil.startPollingTask(guid2); + CommandCoordinatorUtil.startPollingTask(guid1); + CommandCoordinatorUtil.startPollingTask(guid2); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java index e4bf159..ca153f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.VmCommand; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; -import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.errors.VDSError; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -96,11 +96,11 @@ if (startPollingTasks) { if (!Guid.Empty.equals(memoryImageRemovalTaskId)) { - TaskManagerUtil.startPollingTask(memoryImageRemovalTaskId); + CommandCoordinatorUtil.startPollingTask(memoryImageRemovalTaskId); } if (confImageRemovalTaskId != null && !Guid.Empty.equals(confImageRemovalTaskId)) { - TaskManagerUtil.startPollingTask(confImageRemovalTaskId); + CommandCoordinatorUtil.startPollingTask(confImageRemovalTaskId); } } 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 343ba82..d1c3664 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 @@ -364,7 +364,7 @@ public static void removeTaskFromDbByTaskId(Guid taskId) { try { - if (TaskManagerUtil.callRemoveTaskFromDbByTaskId(taskId) != 0) { + if (CommandCoordinatorUtil.callRemoveTaskFromDbByTaskId(taskId) != 0) { log.infoFormat("Removed task {0} from DataBase", taskId); } } catch (RuntimeException e) { 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 d875e0f..88a80a2 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 @@ -68,7 +68,7 @@ } private static void addOrUpdateTaskInDB(AsyncTasks asyncTask) { - TaskManagerUtil.addOrUpdateTaskInDB(asyncTask); + CommandCoordinatorUtil.addOrUpdateTaskInDB(asyncTask); } private static AsyncTaskDAO getAsyncTaskDao() { 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 deleted file mode 100644 index 7b31e84..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/TaskManagerUtil.java +++ /dev/null @@ -1,195 +0,0 @@ -package org.ovirt.engine.core.bll.tasks; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Future; - -import org.ovirt.engine.core.bll.CommandBase; -import org.ovirt.engine.core.bll.context.CommandContext; -import org.ovirt.engine.core.bll.tasks.interfaces.CommandCoordinator; -import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo; -import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus; -import org.ovirt.engine.core.common.businessentities.AsyncTasks; -import org.ovirt.engine.core.common.businessentities.CommandEntity; -import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.compat.CommandStatus; -import org.ovirt.engine.core.compat.DateTime; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.backendcompat.CommandExecutionStatus; - -public class TaskManagerUtil { - - public static final CommandCoordinator coco = new CommandCoordinatorImpl(); - - public static void startPollingTask(Guid taskID) { - getAsyncTaskManager().startPollingTask(taskID); - } - - public static void addStoragePoolExistingTasks(StoragePool sp) { - getAsyncTaskManager().addStoragePoolExistingTasks(sp); - } - - public static boolean hasTasksForEntityIdAndAction(Guid id, VdcActionType type) { - return getAsyncTaskManager().hasTasksForEntityIdAndAction(id, type); - } - - public static boolean hasTasksByStoragePoolId(Guid storagePoolID) { - return getAsyncTaskManager().hasTasksByStoragePoolId(storagePoolID); - } - - public static void initAsyncTaskManager() { - getAsyncTaskManager().initAsyncTaskManager(); - } - - public static boolean entityHasTasks(Guid id) { - return getAsyncTaskManager().entityHasTasks(id); - } - - public static ArrayList<AsyncTaskStatus> pollTasks(java.util.ArrayList<Guid> taskIdList) { - return getAsyncTaskManager().pollTasks(taskIdList); - } - - public static Guid createTask( - Guid taskId, - CommandBase command, - AsyncTaskCreationInfo asyncTaskCreationInfo, - VdcActionType parentCommand, - String description, - Map<Guid, VdcObjectType> entitiesMap) { - return coco.createTask(taskId, - command, - asyncTaskCreationInfo, - parentCommand, - description, - entitiesMap); - } - - public static SPMAsyncTask concreteCreateTask( - Guid taskId, - CommandBase command, - AsyncTaskCreationInfo asyncTaskCreationInfo, - VdcActionType parentCommand) { - return coco.concreteCreateTask(taskId, - command, - asyncTaskCreationInfo, - parentCommand); - } - - public static void cancelTasks(final CommandBase command) { - coco.cancelTasks(command); - } - - public static void revertTasks(final CommandBase command) { - coco.revertTasks(command); - } - - public static AsyncTasks getAsyncTask( - Guid taskId, - CommandBase command, - AsyncTaskCreationInfo asyncTaskCreationInfo, - VdcActionType parentCommand) { - return coco.getAsyncTask(taskId, command, asyncTaskCreationInfo, parentCommand); - } - - public static AsyncTasks createAsyncTask( - CommandBase command, - AsyncTaskCreationInfo asyncTaskCreationInfo, - VdcActionType parentCommand) { - return coco.createAsyncTask(command, asyncTaskCreationInfo, parentCommand); - } - - public static void logAndFailTaskOfCommandWithEmptyVdsmId(Guid taskId, String message) { - getAsyncTaskManager().logAndFailTaskOfCommandWithEmptyVdsmId(taskId, message); - } - - public static void logAndFailTaskOfCommandWithEmptyVdsmId(AsyncTasks task, String message) { - getAsyncTaskManager().logAndFailTaskOfCommandWithEmptyVdsmId(task, message); - } - - public static void removeTaskFromDbByTaskId(Guid taskId) { - AsyncTaskManager.removeTaskFromDbByTaskId(taskId); - } - - public static AsyncTasks getAsyncTaskFromDb(Guid asyncTaskId) { - return coco.getAsyncTaskFromDb(asyncTaskId); - } - - public static void saveAsyncTaskToDb(AsyncTasks asyncTask) { - coco.saveAsyncTaskToDb(asyncTask); - } - - public static int callRemoveTaskFromDbByTaskId(Guid taskId) { - return coco.removeTaskFromDbByTaskId(taskId); - } - - public static void addOrUpdateTaskInDB(AsyncTasks asyncTask) { - coco.addOrUpdateTaskInDB(asyncTask); - } - - public static void persistCommand(CommandEntity cmdEntity, CommandContext cmdContext) { - coco.persistCommand(cmdEntity, cmdContext); - } - - public static List<Guid> getChildCommandIds(Guid commandId) { - return coco.getChildCommandIds(commandId); - } - - public static CommandEntity getCommandEntity(Guid commandId) { - return coco.getCommandEntity(commandId); - } - - public static CommandBase<?> retrieveCommand(Guid commandId) { - return coco.retrieveCommand(commandId); - } - - public static void removeCommand(Guid commandId) { - coco.removeCommand(commandId); - } - - public static void removeAllCommandsInHierarchy(Guid commandId) { - coco.removeAllCommandsInHierarchy(commandId); - } - - public static void removeAllCommandsBeforeDate(DateTime cutoff) { - coco.removeAllCommandsBeforeDate(cutoff); - } - - public static CommandStatus getCommandStatus(Guid commandId) { - return coco.getCommandStatus(commandId); - } - - public static void updateCommandStatus(Guid commandId, CommandStatus status) { - coco.updateCommandStatus(commandId, status); - } - - public static CommandExecutionStatus getCommandExecutionStatus(Guid commandId) { - CommandEntity cmdEntity = coco.getCommandEntity(commandId); - return cmdEntity == null ? CommandExecutionStatus.UNKNOWN : - cmdEntity.isExecuted() ? CommandExecutionStatus.EXECUTED : CommandExecutionStatus.NOT_EXECUTED; - } - - public static void updateCommandExecuted(Guid commandId) { - coco.updateCommandExecuted(commandId); - } - - public static Future<VdcReturnValueBase> executeAsyncCommand(VdcActionType actionType, - VdcActionParametersBase parameters, - CommandContext cmdContext) { - return coco.executeAsyncCommand(actionType, parameters, cmdContext); - } - - public static VdcReturnValueBase getCommandReturnValue(Guid cmdId) { - CommandEntity cmdEnity = coco.getCommandEntity(cmdId); - return cmdEnity == null ? null : cmdEnity.getReturnValue(); - } - - private static AsyncTaskManager getAsyncTaskManager() { - return AsyncTaskManager.getInstance(coco); - } - -} -- To view, visit http://gerrit.ovirt.org/31346 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf796edd6c0812dac03bbf1e71b637e9d2b452e5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
