anmolbabu has posted comments on this change. Change subject: engine: Bll to resume geo-rep session ......................................................................
Patch Set 8: (9 comments) http://gerrit.ovirt.org/#/c/32935/8/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepGlusterVolumeCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepGlusterVolumeCommand.java: Line 28: if (!super.canDoAction()) { Line 29: return false; Line 30: } Line 31: if (getGeoRepSession().getStatus().equals(GeoRepSessionStatus.ACTIVE)) { Line 32: addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GEOREP_SESSION_RESUMED); > ACTION_TYPE_FAILED_GEOREP_SESSION_ALREADY_RESUMED Done Line 33: return false; Line 34: } Line 35: return true; Line 36: } http://gerrit.ovirt.org/#/c/32935/8/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java: Line 299: StartRemoveGlusterVolumeBricks(1422, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), Line 300: StopRemoveGlusterVolumeBricks(1423, ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE), Line 301: CommitRemoveGlusterVolumeBricks(1424, ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE), Line 302: RefreshGlusterVolumeDetails(1425, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), Line 303: GlusterVolumeGeoRepStart(1426, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), > This is not part of this patch, no? Done Line 304: ResumeGeoRepSession(1428, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), Line 305: Line 306: // Scheduling Policy Line 307: AddClusterPolicy(1450, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, false, QuotaDependency.NONE), Line 300: StopRemoveGlusterVolumeBricks(1423, ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE), Line 301: CommitRemoveGlusterVolumeBricks(1424, ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE), Line 302: RefreshGlusterVolumeDetails(1425, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), Line 303: GlusterVolumeGeoRepStart(1426, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), Line 304: ResumeGeoRepSession(1428, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), > Why not 1427? Changing it 1430 as per the merge order Line 305: Line 306: // Scheduling Policy Line 307: AddClusterPolicy(1450, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, false, QuotaDependency.NONE), Line 308: EditClusterPolicy(1451, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, false, QuotaDependency.NONE), http://gerrit.ovirt.org/#/c/32935/8/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java: Line 91: VAR__ACTION__HOT_UNPLUG, Line 92: VAR__ACTION__LOGON, Line 93: VAR__ACTION__LOGOFF, Line 94: VAR__ACTION__REBALANCE_START, Line 95: VAR_ACTION_GEO_REP_START, > not part of this patch Done Line 96: VAR__ACTION__REBALANCE_STOP, Line 97: VAR_ACTION_GEO_REP_RESUME, Line 98: VAR__ACTION__REMOVE_BRICKS_START, Line 99: VAR__ACTION__ASSIGN, Line 93: VAR__ACTION__LOGOFF, Line 94: VAR__ACTION__REBALANCE_START, Line 95: VAR_ACTION_GEO_REP_START, Line 96: VAR__ACTION__REBALANCE_STOP, Line 97: VAR_ACTION_GEO_REP_RESUME, > not needed Done Line 98: VAR__ACTION__REMOVE_BRICKS_START, Line 99: VAR__ACTION__ASSIGN, Line 100: VAR__ACTION__START_PROFILE, Line 101: VAR__ACTION__STOP_PROFILE, http://gerrit.ovirt.org/#/c/32935/8/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties File backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties: Line 1131: ACTION_TYPE_FAILED_GLUSTER_VOLUME_CANNOT_STOP_REMOVE_BRICK_IN_PROGRESS= Cannot ${action} ${type}. Remove brick operation is running on the volume ${volumeName} in cluster ${vdsGroup}. Line 1132: ACTION_TYPE_FAILED_GLUSTER_OPERATION_INPROGRESS=Cannot ${action} ${type}. Gluster operation is in progress in cluster. Please try again. Line 1133: ACTION_TYPE_FAILED_GEOREP_SESSION_INVALID=Cannot ${action} ${type}. Geo-replication session not found. Line 1134: ACTION_TYPE_FAILED_GEOREP_SESSION_LOCKED=Cannot ${action} ${type}. Another action is in progress on this geo-replication session. Please try again. Line 1135: ACTION_TYPE_FAILED_GEOREP_SESSION_RESUMED=Cannot ${action} ${type}. Geo-replication session is resumed. > ACTION_TYPE_FAILED_GEOREP_SESSION_ALREADY_RESUMED Done Line 1136: ACTION_TYPE_FAILED_TAG_ID_REQUIRED=Cannot ${action} ${type}. Tag ID is required. Line 1137: Line 1138: ACTION_TYPE_FAILED_QOS_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}. Values are out of range. Line 1139: ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_EXIST=Cannot ${action} ${type}. Invalid data center. http://gerrit.ovirt.org/#/c/32935/8/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties File backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties: Line 716: GLUSTER_VOLUME_ADD_BRICK_FAILED=Gluster Volume ${glusterVolumeName} add brick failed. Line 717: GLUSTER_VOLUME_REBALANCE_START=Gluster Volume ${glusterVolumeName} rebalance started. Line 718: GLUSTER_VOLUME_REBALANCE_START_FAILED=Could not start Gluster Volume ${glusterVolumeName} rebalance. Line 719: GEOREP_SESSION_RESUMED=Geo-replication session on volume ${glusterVolumeName} has been resumed. Line 720: GEOREP_SESSION_RESUMED_FAILED=Failed to resume geo-replication session on volume ${glusterVolumeName} > GEOREP_SESSION_RESUME_FAILED ? The exception name returned by vdsm is a little different. Renaming it here. Line 721: GLUSTER_VOLUME_REBALANCE_STOP=Gluster Volume ${glusterVolumeName} rebalance stopped. Line 722: GLUSTER_VOLUME_REBALANCE_STOP_FAILED=Could not stop rebalance of gluster volume ${glusterVolumeName}. Line 723: START_REMOVING_GLUSTER_VOLUME_BRICKS=Started removing bricks from Volume ${glusterVolumeName} Line 724: START_REMOVING_GLUSTER_VOLUME_BRICKS_FAILED=Could not start remove bricks from Volume ${glusterVolumeName} http://gerrit.ovirt.org/#/c/32935/8/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java File frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java: Line 338: String AuditLogType___GLUSTER_VOLUME_REBALANCE_START_FAILED(); Line 339: Line 340: String AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUME_FAILED(); Line 341: Line 342: String AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUME(); > AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUMED ? It should match with the name in auditlogtype right? Line 343: Line 344: String AuditLogType___GLUSTER_VOLUME_REBALANCE_STOP(); Line 345: Line 346: String AuditLogType___GLUSTER_VOLUME_REBALANCE_STOP_FAILED(); http://gerrit.ovirt.org/#/c/32935/8/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties: Line 163: AuditLogType___GLUSTER_VOLUME_REMOVE_BRICKS=Gluster Volume Bricks Removed Line 164: AuditLogType___GLUSTER_VOLUME_REMOVE_BRICKS_FAILED=Gluster Volume Bricks could not be removed Line 165: AuditLogType___GLUSTER_VOLUME_REBALANCE_FINISHED=Gluster Volume rebalance finished Line 166: AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUME_FAILED=Failed to resume geo-replication session on volume Line 167: AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUME=Geo-replication session resumed on volume > AuditLogType___GLUSTER_VOLUME_GEO_REP_RESUMED It should match with the corresponding name in AuditLogType right? Line 168: AuditLogType___GLUSTER_VOLUME_MIGRATE_BRICK_DATA_FINISHED=Gluster Volume migration of data for remove brick finished Line 169: AuditLogType___START_REMOVING_GLUSTER_VOLUME_BRICKS=Started removing bricks from Volume Line 170: AuditLogType___START_REMOVING_GLUSTER_VOLUME_BRICKS_FAILED=Could not remove volume bricks Line 171: AuditLogType___GLUSTER_VOLUME_ADD_BRICK=Gluster Volume brick(s) added -- To view, visit http://gerrit.ovirt.org/32935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c8a94c84758d89096c8726b9c11d5d0990a7002 Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayi...@redhat.com> Gerrit-Reviewer: Ramesh N <rnach...@redhat.com> Gerrit-Reviewer: Sahina Bose <sab...@redhat.com> Gerrit-Reviewer: Shubhendu Tripathi <shtri...@redhat.com> Gerrit-Reviewer: anmolbabu <anb...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
