Sahina Bose has posted comments on this change. Change subject: engine: VDS commands for volume geo-rep status and detail ......................................................................
Patch Set 7: (8 comments) Patchset to follow http://gerrit.ovirt.org/#/c/31799/7/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties File backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties: Line 370: GlusterServiceActionNotSupported=Gluster service action not supported Line 371: GlusterVolumeStatusAllFailedException=Failed to get gluster tasks list Line 372: GlusterVolumeRebalanceStatusFailedException=Failed to get gluster volume rebalance status Line 373: GlusterVolumeGeoRepStatusFailedException=Failed to get gluster volume geo-replication status Line 374: GlusterVolumeGeoRepStatusDetailFailedException=Failed to get gluster volume geo rep status detail > "volume geo-replication", just to be consistent :) Done :) Line 375: GlusterLibgfapiException=Command failed due to gluster libgfapi exception Line 376: GlfsStatvfsException=Failed to get gluster volume size info Line 377: GlfsInitException=Command failed while mounting gluster volume Line 378: GlfsFiniException=Command failed while unmounting gluster volume http://gerrit.ovirt.org/#/c/31799/7/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepStatusVDSCommand.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepStatusVDSCommand.java: Line 19: protected void executeVdsBrokerCommand() { Line 20: GlusterVolumeGeoRepSessionVDSParameters parameter = getParameters(); Line 21: if (parameter.getVolumeName() == null) { Line 22: result = getBroker().glusterVolumeGeoRepStatus(); Line 23: } else if (parameter.getVolumeName() != null && (parameter.getSlaveHost() == null || parameter.getSlaveVolume() == null)) { > parameter.getVolumeName() != null is a redundant check Done Line 24: result = getBroker().glusterVolumeGeoRepStatus(parameter.getVolumeName()); Line 25: } else { Line 26: result = getBroker().glusterVolumeGeoRepStatus(parameter.getVolumeName(), parameter.getSlaveHost(), parameter.getSlaveVolume()); Line 27: } http://gerrit.ovirt.org/#/c/31799/7/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusDetailForXmlRpc.java: Line 7: import org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepSession; Line 8: import org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepSessionDetails; Line 9: Line 10: Line 11: public class GlusterVolumeGeoRepStatusDetailForXmlRpc extends GlusterVolumeGeoRepStatusForXmlRpc{ > Ctrl + Shift + f required ?? Done Line 12: Line 13: private static final String FILES_SYNCED = "filesSyncd"; Line 14: private static final String FILES_PENDING = "filesPending"; Line 15: private static final String BYTES_PENDING = "bytesPending"; Line 9: Line 10: Line 11: public class GlusterVolumeGeoRepStatusDetailForXmlRpc extends GlusterVolumeGeoRepStatusForXmlRpc{ Line 12: Line 13: private static final String FILES_SYNCED = "filesSyncd"; > Is the field name filesSyncd returned from VDSM or filesSynced?? it's filesSyncd Line 14: private static final String FILES_PENDING = "filesPending"; Line 15: private static final String BYTES_PENDING = "bytesPending"; Line 16: private static final String DELETES_PENDING = "deletesPending"; Line 17: private static final String FILES_SKIPPED = "filesSkipped"; Line 14: private static final String FILES_PENDING = "filesPending"; Line 15: private static final String BYTES_PENDING = "bytesPending"; Line 16: private static final String DELETES_PENDING = "deletesPending"; Line 17: private static final String FILES_SKIPPED = "filesSkipped"; Line 18: private static final String GEO_REP_PAIRS = "pairs"; > "pairs" is already defined in super class.. Changed pairs to protected in super class Line 19: Line 20: private final ArrayList<GlusterGeoRepSessionDetails> geoRepDetails = new ArrayList<GlusterGeoRepSessionDetails>(); Line 21: private final List<GlusterGeoRepSession> geoRepSessions = new ArrayList<GlusterGeoRepSession>(); Line 22: http://gerrit.ovirt.org/#/c/31799/7/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatusForXmlRpc.java: Line 40: Guid masterNodeGlusterId; Line 41: if(innerMap.containsKey(MASTER_NODE_UUID)) { Line 42: masterNodeGlusterId = new Guid(innerMap.get(MASTER_NODE_UUID).toString()); Line 43: } else { Line 44: log.error("Host Node Id is not available"); > "Master node UUID is not available" ? Done Line 45: return null; Line 46: } Line 47: String masterBrickDir = (innerMap.containsKey(MASTER_BRICK)) ? innerMap.get(MASTER_BRICK).toString() : null; Line 48: GlusterServer glusterServer = getDbUtils().getServerByUuid(masterNodeGlusterId); http://gerrit.ovirt.org/#/c/31799/7/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java File frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java: Line 798: @DefaultStringValue("Failed to get gluster volume rebalance status") Line 799: String GlusterVolumeRebalanceStatusFailedException(); Line 800: Line 801: @DefaultStringValue("Failed to get gluster volume geo-replication status") Line 802: String GlusterVolumeGeoRepStatusDFailed(); > %s/GlusterVolumeGeoRepStatusDFailed/GlusterVolumeGeoRepStatusFailed/g Done Line 803: Line 804: @DefaultStringValue("Failed to get gluster volume geo rep status detail") Line 805: String GlusterVolumeGeoRepStatusDetailFailed(); Line 806: Line 800: Line 801: @DefaultStringValue("Failed to get gluster volume geo-replication status") Line 802: String GlusterVolumeGeoRepStatusDFailed(); Line 803: Line 804: @DefaultStringValue("Failed to get gluster volume geo rep status detail") > "volume geo-replication" Done Line 805: String GlusterVolumeGeoRepStatusDetailFailed(); Line 806: Line 807: @DefaultStringValue("Failed to get status of gluster volume remove bricks") Line 808: String GlusterVolumeRemoveBrickStatusFailed(); -- To view, visit http://gerrit.ovirt.org/31799 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id313742c9f3c036a0017fe37bd818af1bed0e081 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sab...@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
