Ravi Nori has uploaded a new change for review. Change subject: engine: Fix confusing names in async tasks ......................................................................
engine: Fix confusing names in async tasks Fix confusing name for action and command parameters in AsyncTasks and Command Entities Change-Id: I6e619857ae36f1b69a4370ddcf53aee45c2c2c6f 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/tasks/CoCoAsyncTaskHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandCoordinatorImpl.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/CommandEntityDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M packaging/dbscripts/async_tasks_sp.sql M packaging/dbscripts/command_entities_sp.sql A packaging/dbscripts/upgrade/03_05_0870_rename_async_tasks_columns.sql 12 files changed, 61 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/31345/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 3149ad4..1924261 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 @@ -1415,7 +1415,7 @@ _returnValue = returnValue; } - protected VdcActionType getActionType() { + public VdcActionType getActionType() { try { if (actionType == null) { String name = getClass().getName(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java index 2008ac2..639b6df 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java @@ -155,7 +155,7 @@ private void map(CommandEntity cmdEntity, AsyncTasks asyncTask) { if (cmdEntity != null) { - asyncTask.setActionParameters(cmdEntity.getActionParameters()); + asyncTask.setTaskParameters(cmdEntity.getCommandParameters()); asyncTask.setRootCommandId(cmdEntity.getRootCommandId()); asyncTask.setCommandStatus(cmdEntity.getCommandStatus()); asyncTask.setCommandType(cmdEntity.getCommandType()); @@ -168,7 +168,7 @@ CommandStatus status = entity == null ? asyncTask.getCommandStatus() : entity.getCommandStatus(); CommandEntity cmdEntity = entity == null ? new CommandEntity() : entity; cmdEntity.setId(asyncTask.getCommandId()); - cmdEntity.setActionParameters(asyncTask.getActionParameters()); + cmdEntity.setCommandParameters(asyncTask.getTaskParameters()); cmdEntity.setRootCommandId(asyncTask.getRootCommandId()); cmdEntity.setCommandStatus(status); cmdEntity.setCommandType(asyncTask.getCommandType()); @@ -270,6 +270,9 @@ asyncTask = getAsyncTaskFromDb(taskId); } if (asyncTask != null) { + if (VdcActionType.Unknown.equals(command.getParameters().getCommandType())) { + command.getParameters().setCommandType(command.getActionType()); + } VdcActionParametersBase parentParameters = command.getParentParameters(parentCommand); asyncTask.setaction_type(parentCommand); asyncTask.setVdsmTaskId(asyncTaskCreationInfo.getVdsmTaskId()); @@ -281,7 +284,7 @@ asyncTask.setStoragePoolId(asyncTaskCreationInfo.getStoragePoolID()); asyncTask.setTaskType(asyncTaskCreationInfo.getTaskType()); asyncTask.setCommandStatus(command.getCommandStatus()); - asyncTask.setCommandType(getEndActionType(asyncTask)); + asyncTask.setCommandType(command.getParameters().getCommandType()); } else { asyncTask = createAsyncTask(command, asyncTaskCreationInfo, parentCommand); } @@ -293,6 +296,9 @@ AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { VdcActionParametersBase parentParameters = command.getParentParameters(parentCommand); + if (VdcActionType.Unknown.equals(command.getParameters().getCommandType())) { + command.getParameters().setCommandType(command.getActionType()); + } AsyncTasks asyncTask = new AsyncTasks(parentCommand, AsyncTaskResultEnum.success, AsyncTaskStatusEnum.running, 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 8f99f35..7916fbc 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 @@ -127,10 +127,10 @@ if (cmdContext == null) { cmdContext = new CommandContext(new EngineContext()).withExecutionContext(new ExecutionContext()); } - if (CommandsFactory.hasConstructor(cmdEntity.getCommandType(), cmdEntity.getActionParameters(), cmdContext)) { - command = CommandsFactory.createCommand(cmdEntity.getCommandType(), cmdEntity.getActionParameters(), cmdContext); + if (CommandsFactory.hasConstructor(cmdEntity.getCommandType(), cmdEntity.getCommandParameters(), cmdContext)) { + command = CommandsFactory.createCommand(cmdEntity.getCommandType(), cmdEntity.getCommandParameters(), cmdContext); } else { - command = CommandsFactory.createCommand(cmdEntity.getCommandType(), cmdEntity.getActionParameters()); + command = CommandsFactory.createCommand(cmdEntity.getCommandType(), cmdEntity.getCommandParameters()); } command.setCommandStatus(cmdEntity.getCommandStatus(), false); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java index 7042cac..b24c61e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java @@ -63,8 +63,8 @@ cmdEntity.setId(commandId); cmdEntity.setRootCommandId(rootCommandId); cmdEntity.setCommandStatus(cmdStatus); - cmdEntity.setActionParameters(taskParameters); - cmdEntity.setCommandType(getEndActionType()); + cmdEntity.setCommandParameters(taskParameters); + cmdEntity.setCommandType(taskParameters.getCommandType()); } public VdcActionType getaction_type() { @@ -126,11 +126,11 @@ } public VdcActionParametersBase getTaskParameters() { - return cmdEntity.getActionParameters(); + return cmdEntity.getCommandParameters(); } public void setTaskParameters(VdcActionParametersBase value) { - cmdEntity.setActionParameters(value); + cmdEntity.setCommandParameters(value); } public Guid getStepId() { @@ -142,7 +142,7 @@ } private VdcActionType getEndActionType() { - VdcActionType commandType = getActionParameters().getCommandType(); + VdcActionType commandType = getTaskParameters().getCommandType(); if (!VdcActionType.Unknown.equals(commandType)) { return commandType; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java index 0f22808..23861d3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CommandEntity.java @@ -17,7 +17,7 @@ private Guid jobId; private Guid stepId; private VdcActionType commandType; - private VdcActionParametersBase actionParameters; + private VdcActionParametersBase commandParameters; private VdcReturnValueBase returnValue; private Date createdAt; private CommandStatus commandStatus = CommandStatus.UNKNOWN; @@ -61,12 +61,12 @@ this.createdAt = createdAt; } - public VdcActionParametersBase getActionParameters() { - return this.actionParameters; + public VdcActionParametersBase getCommandParameters() { + return this.commandParameters; } - public void setActionParameters(VdcActionParametersBase value) { - this.actionParameters = value; + public void setCommandParameters(VdcActionParametersBase value) { + this.commandParameters = value; } public Guid getId() { @@ -132,7 +132,7 @@ entity.setJobId(jobId); entity.setStepId(stepId); entity.setCommandType(actionType); - entity.setActionParameters(params); + entity.setCommandParameters(params); entity.setCommandStatus(status); entity.setCallBackEnabled(callBackEnabled); entity.setReturnValue(returnValue); @@ -170,4 +170,5 @@ public void setExecuted(boolean executed) { this.executed = executed; } + } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java index b2e64d2..1c5235e 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java @@ -68,7 +68,7 @@ entity.setstatus(AsyncTaskStatusEnum.forValue(rs.getInt("status"))); entity.setTaskId(getGuidDefaultEmpty(rs, "task_id")); entity.setVdsmTaskId(getGuid(rs, "vdsm_task_id")); - entity.setTaskParameters(deserializeParameters(rs.getString("task_parameters"), rs.getString("task_params_class"))); + entity.setActionParameters(deserializeParameters(rs.getString("action_parameters"), rs.getString("action_params_class"))); entity.setStepId(getGuid(rs, "step_id")); entity.setCommandId(getGuidDefaultEmpty(rs, "command_id")); entity.setStartTime(DbFacadeUtils.fromDate(rs.getTimestamp("started_at"))); @@ -97,8 +97,8 @@ addValue("status", task.getstatus()); addValue("vdsm_task_id", task.getVdsmTaskId()); addValue("task_id", task.getTaskId()); - addValue("task_parameters", serializeParameters(task.getTaskParameters())); - addValue("task_params_class", task.getTaskParameters().getClass().getName()); + addValue("action_parameters", serializeParameters(task.getActionParameters())); + addValue("action_params_class", task.getActionParameters().getClass().getName()); addValue("step_id", task.getStepId()); addValue("command_id", task.getCommandId()); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java index ea081f1..df4f3fa 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/CommandEntityDaoDbFacadeImpl.java @@ -31,7 +31,7 @@ result.setCreatedAt(DbFacadeUtils.fromDate(resultSet.getTimestamp("created_at"))); result.setCommandType(VdcActionType.forValue(resultSet.getInt("command_type"))); result.setRootCommandId(Guid.createGuidFromString(resultSet.getString("root_command_id"))); - result.setActionParameters(deserializeParameters(resultSet.getString("action_parameters"), resultSet.getString("action_parameters_class"))); + result.setCommandParameters(deserializeParameters(resultSet.getString("command_parameters"), resultSet.getString("command_params_class"))); result.setReturnValue(deserializeReturnValue(resultSet.getString("return_value"), resultSet.getString("return_value_class"))); result.setCommandStatus(getCommandStatus(resultSet.getString("status"))); result.setExecuted(resultSet.getBoolean("executed")); @@ -61,8 +61,8 @@ .addValue("root_command_id", Guid.isNullOrEmpty(entity.getRootCommandId()) ? Guid.Empty : entity.getRootCommandId()) .addValue("job_id", Guid.isNullOrEmpty(entity.getJobId()) ? Guid.Empty : entity.getJobId()) .addValue("step_id", Guid.isNullOrEmpty(entity.getStepId()) ? Guid.Empty : entity.getStepId()) - .addValue("action_parameters", serializeParameters(entity.getActionParameters())) - .addValue("action_parameters_class", entity.getActionParameters() == null ? null : entity.getActionParameters().getClass().getName()) + .addValue("command_parameters", serializeParameters(entity.getCommandParameters())) + .addValue("command_params_class", entity.getCommandParameters() == null ? null : entity.getCommandParameters().getClass().getName()) .addValue("status", entity.getCommandStatus().toString()) .addValue("executed", entity.isExecuted()) .addValue("callback_enabled", entity.isCallBackEnabled()) diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/CommandEntityDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/CommandEntityDaoTest.java index 4d3dfe4..a25e7c0 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/CommandEntityDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/CommandEntityDaoTest.java @@ -25,7 +25,7 @@ commandEntity.setId(Guid.newGuid()); commandEntity.setCommandStatus(CommandStatus.ACTIVE); VdcActionParametersBase params = new VdcActionParametersBase(); - commandEntity.setActionParameters(params); + commandEntity.setCommandParameters(params); return commandEntity; } diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 5f5065b..3b614d5 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -51,7 +51,7 @@ <column>command_type</column> <column>root_command_id</column> <column>created_at</column> - <column>action_parameters</column> + <column>command_parameters</column> <column>status</column> <row> <value>340fd52b-3400-4cdd-8d3f-c9d03704b0a1</value> diff --git a/packaging/dbscripts/async_tasks_sp.sql b/packaging/dbscripts/async_tasks_sp.sql index 694429f..01ad67a 100644 --- a/packaging/dbscripts/async_tasks_sp.sql +++ b/packaging/dbscripts/async_tasks_sp.sql @@ -6,8 +6,8 @@ v_status INTEGER, v_vdsm_task_id UUID, v_task_id UUID, - v_task_parameters text, - v_task_params_class varchar(256), + v_action_parameters text, + v_action_params_class varchar(256), v_step_id UUID, v_command_id UUID, v_started_at timestamp WITH TIME ZONE, @@ -16,8 +16,8 @@ RETURNS VOID AS $procedure$ BEGIN -INSERT INTO async_tasks(action_type, result, status, vdsm_task_id, task_id, task_parameters, task_params_class, step_id, command_id, started_at,storage_pool_id, task_type) - VALUES(v_action_type, v_result, v_status, v_vdsm_task_id, v_task_id, v_task_parameters, v_task_params_class, v_step_id, v_command_id, v_started_at, v_storage_pool_id, v_async_task_type); +INSERT INTO async_tasks(action_type, result, status, vdsm_task_id, task_id, action_parameters, action_params_class, step_id, command_id, started_at,storage_pool_id, task_type) + VALUES(v_action_type, v_result, v_status, v_vdsm_task_id, v_task_id, v_action_parameters, v_action_params_class, v_step_id, v_command_id, v_started_at, v_storage_pool_id, v_async_task_type); END; $procedure$ LANGUAGE plpgsql; @@ -27,8 +27,8 @@ v_status INTEGER, v_vdsm_task_id UUID, v_task_id UUID, - v_task_parameters text, - v_task_params_class varchar(256), + v_action_parameters text, + v_action_params_class varchar(256), v_step_id UUID, v_command_id UUID, v_storage_pool_id UUID) @@ -41,8 +41,8 @@ SET action_type = v_action_type, result = v_result, status = v_status, - task_parameters = v_task_parameters, - task_params_class = v_task_params_class, + action_parameters = v_action_parameters, + action_params_class = v_action_params_class, step_id = v_step_id, command_id = v_command_id, vdsm_task_id = v_vdsm_task_id, @@ -56,8 +56,8 @@ v_status INTEGER, v_vdsm_task_id UUID, v_task_id UUID, - v_task_parameters text, - v_task_params_class varchar(256), + v_action_parameters text, + v_action_params_class varchar(256), v_step_id UUID, v_command_id UUID, v_started_at timestamp WITH TIME ZONE, @@ -68,9 +68,9 @@ BEGIN IF NOT EXISTS (SELECT 1 from async_tasks where async_tasks.task_id = v_task_id) THEN PERFORM Insertasync_tasks(v_action_type, v_result, v_status, v_vdsm_task_id, v_task_id, - v_task_parameters, v_task_params_class, v_step_id, v_command_id, v_started_at, v_storage_pool_id, v_async_task_type); + v_action_parameters, v_action_params_class, v_step_id, v_command_id, v_started_at, v_storage_pool_id, v_async_task_type); ELSE - PERFORM Updateasync_tasks(v_action_type, v_result, v_status, v_vdsm_task_id, v_task_id, v_task_parameters, v_task_params_class, v_step_id, v_command_id, v_storage_pool_id); + PERFORM Updateasync_tasks(v_action_type, v_result, v_status, v_vdsm_task_id, v_task_id, v_action_parameters, v_action_params_class, v_step_id, v_command_id, v_storage_pool_id); END IF; END; $procedure$ LANGUAGE plpgsql; diff --git a/packaging/dbscripts/command_entities_sp.sql b/packaging/dbscripts/command_entities_sp.sql index e3cbfa1..86176c1 100644 --- a/packaging/dbscripts/command_entities_sp.sql +++ b/packaging/dbscripts/command_entities_sp.sql @@ -3,8 +3,8 @@ v_root_command_id uuid, v_job_id uuid, v_step_id uuid, - v_action_parameters text, - v_action_parameters_class varchar(256), + v_command_parameters text, + v_command_params_class varchar(256), v_status varchar(20), v_executed boolean, v_callback_enabled boolean, @@ -13,8 +13,8 @@ RETURNS VOID AS $procedure$ BEGIN - INSERT INTO command_entities(command_id, command_type, root_command_id, job_id, step_id, action_parameters, action_parameters_class, created_at, status, executed, callback_enabled, return_value, return_value_class) - VALUES(v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_action_parameters, v_action_parameters_class, NOW(), v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); + INSERT INTO command_entities(command_id, command_type, root_command_id, job_id, step_id, command_parameters, command_params_class, created_at, status, executed, callback_enabled, return_value, return_value_class) + VALUES(v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_command_parameters, v_command_params_class, NOW(), v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); END; $procedure$ LANGUAGE plpgsql; @@ -24,8 +24,8 @@ v_root_command_id uuid, v_job_id uuid, v_step_id uuid, - v_action_parameters text, - v_action_parameters_class varchar(256), + v_command_parameters text, + v_command_params_class varchar(256), v_status varchar(20), v_executed boolean, v_callback_enabled boolean, @@ -39,8 +39,8 @@ root_command_id = v_root_command_id, job_id = v_job_id, step_id = v_step_id, - action_parameters = v_action_parameters, - action_parameters_class = v_action_parameters_class, + command_parameters = v_command_parameters, + command_params_class = v_command_params_class, status = v_status, executed = v_executed, callback_enabled = v_callback_enabled, @@ -92,8 +92,8 @@ v_root_command_id uuid, v_job_id uuid, v_step_id uuid, - v_action_parameters text, - v_action_parameters_class varchar(256), + v_command_parameters text, + v_command_params_class varchar(256), v_status varchar(20), v_executed boolean, v_callback_enabled boolean, @@ -103,9 +103,9 @@ AS $procedure$ BEGIN IF NOT EXISTS (SELECT 1 from command_entities where command_id = v_command_id) THEN - PERFORM InsertCommandEntity (v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_action_parameters, v_action_parameters_class, v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); + PERFORM InsertCommandEntity (v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_command_parameters, v_command_params_class, v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); ELSE - PERFORM UpdateCommandEntity (v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_action_parameters, v_action_parameters_class, v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); + PERFORM UpdateCommandEntity (v_command_id, v_command_type, v_root_command_id, v_job_id, v_step_id, v_command_parameters, v_command_params_class, v_status, v_executed, v_callback_enabled, v_return_value, v_return_value_class); END IF; END; $procedure$ LANGUAGE plpgsql; diff --git a/packaging/dbscripts/upgrade/03_05_0870_rename_async_tasks_columns.sql b/packaging/dbscripts/upgrade/03_05_0870_rename_async_tasks_columns.sql new file mode 100644 index 0000000..c7cb446 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0870_rename_async_tasks_columns.sql @@ -0,0 +1,4 @@ +select fn_db_rename_column('async_tasks', 'task_parameters', 'action_parameters'); +select fn_db_rename_column('async_tasks', 'task_params_class', 'action_params_class'); +select fn_db_rename_column('command_entities', 'action_parameters', 'command_parameters'); +select fn_db_rename_column('command_entities', 'action_parameters_class', 'command_params_class'); -- To view, visit http://gerrit.ovirt.org/31345 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e619857ae36f1b69a4370ddcf53aee45c2c2c6f 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
