Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ZCS-11850
Browse files Browse the repository at this point in the history
  • Loading branch information
rupeshtelus authored Aug 22, 2022
2 parents 572db4a + 4a954db commit b9b0520
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions store/src/java/com/zimbra/cs/volume/VolumeCLI.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public final class VolumeCLI extends SoapCLI {
private static final String O_CT = "ct";

private static final String O_SMC = "smc";

/** attributes for external storetype **/
private static final String O_ST = "st";
private static final String O_VP = "vp";
Expand Down Expand Up @@ -127,7 +127,7 @@ public final class VolumeCLI extends SoapCLI {
private static final String A_ACCOUNT_PORT = "accountPort";
private static final String A_NAME_SPACE = "nameSpace";
private static final String A_ACCOUNT = "account";

public static final int DEFAULT_USE_INFREQUENT_ACCESS_THRESHOLD = 65536;

private VolumeCLI() throws ServiceException {
Expand All @@ -154,7 +154,7 @@ private VolumeCLI() throws ServiceException {
private String nameSpace;
private String account;
private String storeManagerClass;

private String useInfrequentAccess;
private String useInfrequentAccessThreshold;
private String useIntelligentTiering;
Expand Down Expand Up @@ -283,8 +283,7 @@ private void print(VolumeInfo vol) {
System.out.println(" name: " + vol.getName());
System.out.println(" type: " + toTypeName(vol.getType()));
System.out.println(" path: " + vol.getRootPath());
System.out.println(" compressed: " + vol.isCompressBlobs());

System.out.print(" compressed: " + vol.isCompressBlobs());
if (vol.isCompressBlobs()) {
System.out.println("\t threshold: " + vol.getCompressionThreshold() + " bytes");
} else {
Expand Down Expand Up @@ -523,13 +522,12 @@ && validateBoolean(AdminConstants.A_VOLUME_USE_INTELLIGENT_TIERING, useIntellige
throw new ParseException(INVALID_STORE_TYPE);
}
}

private boolean validateBoolean(String param, String value) throws ParseException {
if ("true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value)) {
return true;
}
throw new ParseException("invalid value of "+param);

}
throw new ParseException("invalid value of " + param);
}

@Override
Expand Down

0 comments on commit b9b0520

Please sign in to comment.