Dhandapani Gopal has posted comments on this change.
Change subject: [WIP] engine: Get Volume Status Query
......................................................................
Patch Set 1: (28 inline comments)
Incorporated review comments.
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeStatusQuery.java
Line 11:
Line 12: /**
Line 13: * Query to get given volume status
Line 14: */
Line 15: public class GetGlusterVolumeStatusQuery<P extends
GlusterVolumeStatusParameters> extends QueriesCommandBase<P> {
Changed the query name to "GetGlusterVolumeAdvancedDetailsQuery".
Line 16:
Line 17: public GetGlusterVolumeStatusQuery(P params) {
Line 18: super(params);
Line 19: }
Line 31: public ClusterUtils getClusterUtils() {
Line 32: return ClusterUtils.getInstance();
Line 33: }
Line 34:
Line 35: public VDSBrokerFrontend getBackendInstance() {
Changed the method name to getBackendResourceManager.
Line 36: return Backend.getInstance()
Line 37: .getResourceManager();
Line 38: }
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/BrickDetails.java
Line 3: import java.util.List;
Line 4:
Line 5: /**
Line 6: * GlusterFS provides lot of volume status information about the volume
brick.
Line 7: * This will consolidate all the status inforamtion
Done
Line 8: *
Line 9: * @see BrickProperties
Line 10: * @see GlusterClientInfo
Line 11: * @see MemoryStatus
Line 10: * @see GlusterClientInfo
Line 11: * @see MemoryStatus
Line 12:
Line 13: */
Line 14: public class BrickDetails extends BrickProperties {
Done
Line 15:
Line 16: private static final long serialVersionUID = -1134758927239004412L;
Line 17:
Line 18: public BrickDetails() {
Line 17:
Line 18: public BrickDetails() {
Line 19: }
Line 20:
Line 21: List<GlusterClientInfo> clientInfo;
Done
Line 22: MemoryStatus memoryStatus;
Line 23:
Line 24: public List<GlusterClientInfo> getClientInfo() {
Line 25: return clientInfo;
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/BrickProperties.java
Line 6: import org.ovirt.engine.core.compat.Guid;
Line 7:
Line 8:
Line 9: /**
Line 10: * The gluster volume status detail.
Done
Line 11: *
Line 12: */
Line 13: public class BrickProperties {
Line 14:
Line 11: *
Line 12: */
Line 13: public class BrickProperties {
Line 14:
Line 15: @NotNull(message = "VALIDATION.GLUSTER.BRICK.ID.NOT_NULL", groups
= { RemoveBrick.class })
Removed the validation annotation.
Line 16: private Guid brickId;
Line 17:
Line 18: private Integer port;
Line 19:
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterClientInfo.java
Line 14: private Integer clientPort;
Line 15:
Line 16: private Integer bytesRead;
Line 17:
Line 18: private Integer bytesWrite;
Done
Line 19:
Line 20: public GlusterClientInfo() {
Line 21: }
Line 22:
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterMallInfo.java
Line 4: /**
Line 5: * The gluster volume memory status Mall Info.
Line 6: *
Line 7: */
Line 8: public class GlusterMallInfo{
Done
Line 9:
Line 10: private Integer arena;
Line 11:
Line 12: private Integer ordblks;
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterMempool.java
Line 4: /**
Line 5: * The gluster volume memory status Mem pool.
Line 6: *
Line 7: */
Line 8: public class GlusterMempool{
Done
Line 9:
Line 10: private static final long serialVersionUID = 4426819375609665363L;
Line 11:
Line 12: private String name;
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeStatusEntity.java
Line 16: * @see GlusterClientInfo
Line 17: * @see MemoryStatus
Line 18:
Line 19: */
Line 20: public class GlusterVolumeStatusEntity implements BusinessEntity<Guid>
{
Done
Line 21:
Line 22: private static final long serialVersionUID = -1134758927239004412L;
Line 23:
Line 24: public GlusterVolumeStatusEntity() {
Line 23:
Line 24: public GlusterVolumeStatusEntity() {
Line 25: }
Line 26:
Line 27: @NotNull(message = "VALIDATION.GLUSTER.VOLUME.ID.NOT_NULL", groups
= { RemoveEntity.class })
Removed the validation annotation
Line 28: private Guid volumeId;
Line 29:
Line 30: List<BrickDetails> brickDetails;
Line 31: List<VolumeStatusNfs> volumeStatusNfs;
Line 28: private Guid volumeId;
Line 29:
Line 30: List<BrickDetails> brickDetails;
Line 31: List<VolumeStatusNfs> volumeStatusNfs;
Line 32: List<VolumeStatusShd> volumeStatusShd;
Done
Line 33:
Line 34: public Guid getId() {
Line 35: return volumeId;
Line 36: }
Line 30: List<BrickDetails> brickDetails;
Line 31: List<VolumeStatusNfs> volumeStatusNfs;
Line 32: List<VolumeStatusShd> volumeStatusShd;
Line 33:
Line 34: public Guid getId() {
Done
Line 35: return volumeId;
Line 36: }
Line 37:
Line 38: public void setId(Guid volumeId) {
Line 62: public void setVolumeStatusShd(List<VolumeStatusShd>
volumeStatusShd) {
Line 63: this.volumeStatusShd = volumeStatusShd;
Line 64: }
Line 65:
Line 66: public class VolumeStatusNfs {
Done
Line 67: public VolumeStatusNfs() {
Line 68:
Line 69: }
Line 70:
Line 141: }
Line 142: }
Line 143:
Line 144: public void copyDetailsFrom(GlusterVolumeStatusEntity entity) {
Line 145: // Copy all the fields which received for "DETAIL"
Removed the comments.
Line 146: for (BrickDetails entityBrick : entity.getBrickDetails()) {
Line 147: for (BrickDetails brick : getBrickDetails()) {
Line 148: if
(entityBrick.getBrickId().equals(brick.getBrickId())) {
Line 149: brick = copyBrickDetails(brick, entityBrick);
Line 162: return brick;
Line 163: }
Line 164:
Line 165: public void copyClientsFrom(GlusterVolumeStatusEntity entity) {
Line 166: // Copy all the fields which received for "Clients"
Removed the comments.
Line 167: for (BrickDetails entityBrick : entity.getBrickDetails()) {
Line 168: for (BrickDetails brick : getBrickDetails()) {
Line 169: if
(entityBrick.getBrickId().equals(brick.getBrickId())) {
Line 170: brick = copyClientDetails(brick, entityBrick);
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeStatusOption.java
Line 1: package org.ovirt.engine.core.common.businessentities.gluster;
Line 2:
Line 3:
Line 4: /**
Line 5: * Enum of Gluster volume Statuses
Done
Line 6: *
Line 7: */
Line 8: public enum GlusterVolumeStatusOption {
Line 9: DETAIL,
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/MemoryStatus.java
Line 8: *
Line 9: */
Line 10: public class MemoryStatus{
Line 11:
Line 12: public MemoryStatus() {
Done
Line 13: }
Line 14:
Line 15: private GlusterMallInfo glusterMallInfo;
Line 16:
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterVolumeStatusParameters.java
Line 5: /**
Line 6: * Parameter class with volume name, brick name and details as
parameters. <br>
Line 7: * This will be used by gluster volume status query. <br>
Line 8: */
Line 9: public class GlusterVolumeStatusParameters extends GlusterParameters {
Done
Line 10: private static final long serialVersionUID = -1224829720081853632L;
Line 11: private String volumeName;
Line 12: private String brickName;
Line 13: private boolean details;
Line 9: public class GlusterVolumeStatusParameters extends GlusterParameters {
Line 10: private static final long serialVersionUID = -1224829720081853632L;
Line 11: private String volumeName;
Line 12: private String brickName;
Line 13: private boolean details;
Done
Line 14:
Line 15: public GlusterVolumeStatusParameters(Guid clusterId, String
volumeName, String brickName, boolean details) {
Line 16: super(clusterId);
Line 17: setVolumeName(volumeName);
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeStatusVDSParameters.java
Line 8: */
Line 9: public class GlusterVolumeStatusVDSParameters extends
GlusterVolumeVDSParameters {
Line 10: private final Guid clusterId;
Line 11: private final String brickName;
Line 12: private final boolean details;
Done
Line 13:
Line 14: public GlusterVolumeStatusVDSParameters(Guid upServerId,
Line 15: Guid clusterId,
Line 16: String volumeName,
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeStatusVDSCommand.java
Line 44: if (getSucceeded()) {
Line 45:
volumeStatusEntity.copyClientsFrom(result.getVolumeStatus());
Line 46:
Line 47: result =
Line 48:
executeVolumeStatusInfo(volumeStatusEntity, GlusterVolumeStatusOption.MEM.name()
Changed the enum names in lower case.
Line 49: .toLowerCase());
Line 50: if (getSucceeded()) {
Line 51:
volumeStatusEntity.copyMemoryFrom(result.getVolumeStatus());
Line 52: }
Line 54: }
Line 55: }
Line 56: }
Line 57:
Line 58: ProceedProxyReturnValue();
Done
Line 59: setReturnValue(volumeStatusEntity);
Line 60: }
Line 61:
Line 62: private GlusterVolumeStatusReturnForXmlRpc
executeVolumeStatusInfo(GlusterVolumeStatusEntity entity,
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GlusterVolumeStatusReturnForXmlRpc.java
Line 72: // We are ignoring missing fields after the status, because on
failure it is
Line 73: // not sent.
Line 74: // [XmlRpcMissingMapping(MappingAction.Ignore),
XmlRpcMember("volumeStatus")]
Line 75:
Line 76: // [XmlRpcMember("status")]
Done
Line 77: public StatusForXmlRpc mStatus;
Line 78:
Line 79: GlusterVolumeStatusEntity volumeStatusEntity;
Line 80: List<BrickDetails> brickDetails;
Line 75:
Line 76: // [XmlRpcMember("status")]
Line 77: public StatusForXmlRpc mStatus;
Line 78:
Line 79: GlusterVolumeStatusEntity volumeStatusEntity;
Done
Line 80: List<BrickDetails> brickDetails;
Line 81: private GlusterVolumeEntity volume;
Line 82: List<VolumeStatusNfs> volumeStatusNfs;
Line 83: List<VolumeStatusShd> volumeStatusShd;
Line 252:
Line 253: private Guid getBrickId(List<GlusterBrickEntity> bricksList,
String qualifiedBrickName) {
Line 254: String[] brickParts = qualifiedBrickName.split(":", -1);
Line 255:
Line 256: if (brickParts.length != 2) {
Done
Line 257: throw new RuntimeException("Invalid brick representation
[" + qualifiedBrickName + "]");
Line 258: }
Line 259: for (GlusterBrickEntity brick : bricksList) {
Line 260: // Compare the brickname with the existing volume brick
Line 261: if (brick.getQualifiedName().equals(qualifiedBrickName)) {
Line 262: return brick.getId();
Line 263: }
Line 264: }
Line 265: return null;
Done
Line 266: }
Line 267:
Line 268: protected GlusterVolumeDao getGlusterVolumeDao() {
Line 269: return DbFacade.getInstance().getGlusterVolumeDao();
--
To view, visit http://gerrit.ovirt.org/7807
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If6b590eaebeb1d06b7278300d5e12b2dab9eb093
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dhandapani Gopal <[email protected]>
Gerrit-Reviewer: Dhandapani Gopal <[email protected]>
Gerrit-Reviewer: Kanagaraj M <[email protected]>
Gerrit-Reviewer: Shireesh Anjal <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
