Sahina Bose has posted comments on this change.
Change subject: gluster: event message for rebalance and remove brick complete
......................................................................
Patch Set 4:
(5 comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java
Line 135: }
Line 136: JobExecutionStatus oldStatus = step.getStatus();
Line 137: step.setDescription(getTaskMessage(cluster,
step.getStepType(), task));
Line 138: step.setStatus(task.getStatus());
Line 139: if(JobExecutionStatus.FINISHED == task.getStatus()) {
What about if task is completed with return status other than finished?
Can you move the logging to within hasTaskCompleted block?
Line 140: if(oldStatus != task.getStatus()) {
Line 141: logMessage(volume.getClusterId(), volume,
taskTypeStrMap.get(task.getType()), task.getStatus().name().toLowerCase(),
taskTypeAuditMsg.get(task.getType()));
Line 142: }
Line 143: }
Line 138: step.setStatus(task.getStatus());
Line 139: if(JobExecutionStatus.FINISHED == task.getStatus()) {
Line 140: if(oldStatus != task.getStatus()) {
Line 141: logMessage(volume.getClusterId(), volume,
taskTypeStrMap.get(task.getType()), task.getStatus().name().toLowerCase(),
taskTypeAuditMsg.get(task.getType()));
Line 142: }
volume could be null. Need to check.
Volume can also be retrieved from task parameters.
Line 143: }
Line 144: if (hasTaskCompleted(task)) {
Line 145: step.markStepEnded(task.getStatus());
Line 146: endStepJob(step);
Line 363: return cluster.supportsGlusterService() &&
GlusterFeatureSupported.glusterAsyncTasks(cluster.getcompatibility_version());
Line 364: }
Line 365:
Line 366: @SuppressWarnings("serial")
Line 367: public void logMessage(Guid clusterId, GlusterVolumeEntity
volume, final String action, final String status, AuditLogType logType) {
Does this need to be public?
Line 368: logUtil.logAuditMessage(clusterId, volume, null, logType, new
HashMap<String, String>(){
Line 369: {
Line 370: put("action", action);
Line 371: put("status", status);
....................................................
File
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java
Line 104: doReturn(jobRepository).when(tasksSyncJob).getJobRepository();
Line 105: doReturn(backend).when(tasksSyncJob).getBackend();
Line 106: doNothing().when(tasksSyncJob).releaseLock(any(Guid.class));
Line 107: doNothing().when(tasksSyncJob).endStepJob(any(Step.class));
Line 108: doNothing().when(tasksSyncJob).logMessage(any(Guid.class),
any(GlusterVolumeEntity.class), any(String.class), any(String.class),
any(AuditLogType.class));
The above line is not required
Line 109: doNothing().when(logUtil).logAuditMessage(any(Guid.class),
any(GlusterVolumeEntity.class), any(VDS.class), any(AuditLogType.class),
any(Map.class));
Line 110: }
Line 111:
Line 112: @Test
....................................................
File
packaging/dbscripts/upgrade/03_04_0130_gluster_volume_remove_brick_data_migration_finished.sql
Line 1: insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_REMOVE_BRICK_DATA_MIGRATION_FINISHED', 'UNASSI
Line 2: GNED');
Please combine the 2 into a single sql file. You could probably name it
gluster_tasks_finished_event_map ?
--
To view, visit http://gerrit.ovirt.org/21080
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If4da9730cd8c251bc5707df981204b092948fb6f
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Darshan N <[email protected]>
Gerrit-Reviewer: Darshan N <[email protected]>
Gerrit-Reviewer: Sahina Bose <[email protected]>
Gerrit-Reviewer: Shubhendu Tripathi <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
