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
rupeshtelus authored Aug 22, 2022
2 parents d487bed + d709e8e commit cf827d1
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 21 deletions.
27 changes: 15 additions & 12 deletions store/src/java/com/zimbra/cs/service/util/VolumeConfigUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,28 @@
package com.zimbra.cs.service.util;

import com.zimbra.client.ZMailbox;
import com.zimbra.common.localconfig.LC;
import com.zimbra.cs.store.helper.ClassHelper;
import org.json.JSONException;
import org.json.JSONObject;

import com.zimbra.common.service.ServiceException;
import com.zimbra.common.soap.AdminConstants;
import com.zimbra.common.util.StringUtil;
import com.zimbra.cs.account.Provisioning;
import com.zimbra.cs.store.StoreManager;
import com.zimbra.cs.store.helper.ClassHelper;
import com.zimbra.cs.volume.Volume;
import com.zimbra.cs.volume.VolumeManager;
import com.zimbra.cs.volume.VolumeServiceException;
import com.zimbra.soap.admin.message.CreateVolumeRequest;
import com.zimbra.soap.admin.message.DeleteVolumeRequest;
import com.zimbra.soap.admin.message.ModifyVolumeRequest;
import com.zimbra.soap.admin.message.GetAllVolumesRequest;
import com.zimbra.soap.admin.message.GetAllVolumesResponse;
import com.zimbra.soap.admin.message.GetVolumeRequest;
import com.zimbra.soap.admin.message.GetVolumeResponse;
import com.zimbra.soap.admin.message.ModifyVolumeRequest;
import com.zimbra.soap.admin.type.VolumeExternalInfo;
import com.zimbra.soap.admin.type.VolumeExternalOpenIOInfo;
import com.zimbra.soap.admin.type.VolumeInfo;
import com.zimbra.util.ExternalVolumeInfoHandler;
import org.json.JSONException;
import org.json.JSONObject;

public class VolumeConfigUtil {

Expand Down Expand Up @@ -162,17 +160,22 @@ public static void validateCreateVolumeRequest(CreateVolumeRequest request, Volu
}

if (AdminConstants.A_VOLUME_S3.equalsIgnoreCase(storageTypeS3)) {
// validate use in frequent access threshold
int useInFrequentAccessThreshold = volInfoRequest.getVolumeExternalInfo().getUseInFrequentAccessThreshold();
if (useInFrequentAccessThreshold < 0) {
throw VolumeServiceException.INVALID_REQUEST("Volume UseInFrequentAccessThreshold can't be negative number", VolumeServiceException.BAD_VOLUME_USE_IN_FREQUENT_ACCESS_THRESHOLD);
}

// validate global bucket id
String globalS3BucketId = volInfoRequest.getVolumeExternalInfo().getGlobalBucketConfigurationId();
if (!extVolInfoHandler.validateGlobalBucketID(globalS3BucketId)) {
throw VolumeServiceException.INVALID_REQUEST("Volume GlobalBucketID provided is incorrect, missing or empty", VolumeServiceException.BAD_VOLUME_GLOBAL_BUCKET_ID);
}

// validating storage classes parameters
if (volInfoRequest.getVolumeExternalInfo().isUseInFrequentAccess() && volInfoRequest.getVolumeExternalInfo().isUseIntelligentTiering()) {
throw VolumeServiceException.INVALID_REQUEST("Either InFrequentAccess or IntelligentTiering can be enabled at time", VolumeServiceException.BAD_VOLUME_USE_IN_FREQUENT_ACCESS);
}

int useInFrequentAccessThreshold = volInfoRequest.getVolumeExternalInfo().getUseInFrequentAccessThreshold();
if (useInFrequentAccessThreshold < 0) {
throw VolumeServiceException.INVALID_REQUEST("Volume UseInFrequentAccessThreshold can't be negative number", VolumeServiceException.BAD_VOLUME_USE_IN_FREQUENT_ACCESS_THRESHOLD);
}

// no validation for volume prefix as of now
} else if (AdminConstants.A_VOLUME_OPEN_IO.equalsIgnoreCase(storageTypeOpenIO)) {
// validate proxy port as positive
Expand Down
66 changes: 57 additions & 9 deletions store/src/java/com/zimbra/cs/volume/VolumeCLI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
*/
package com.zimbra.cs.volume;

import java.io.IOException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.http.HttpException;
import com.google.common.base.Strings;
import com.zimbra.common.auth.ZAuthToken;
import com.zimbra.common.service.ServiceException;
Expand All @@ -45,6 +38,14 @@
import com.zimbra.soap.admin.type.VolumeExternalInfo;
import com.zimbra.soap.admin.type.VolumeExternalOpenIOInfo;
import com.zimbra.soap.admin.type.VolumeInfo;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.http.HttpException;

import java.io.IOException;

public final class VolumeCLI extends SoapCLI {

Expand All @@ -70,6 +71,12 @@ public final class VolumeCLI extends SoapCLI {
private static final String O_STP = "stp";
private static final String O_BID = "bid";

private static final String O_UFA = "ufa";

private static final String O_UFAT = "ufat";

private static final String O_UIT = "uit";

/** attributes for store type OpenIO **/
private static final String O_AP = "ap";
private static final String O_PP = "pp";
Expand All @@ -89,13 +96,16 @@ public final class VolumeCLI extends SoapCLI {
private static final String H_STORE_TYPE = "Store type: internal or external";
private static final String H_STORAGE_TYPE = "Name of the store provider (S3, ObjectStore, OPENIO)";
private static final String H_BUCKET_ID = "S3 Bucket ID";
private static final String H_VOLUME_PREFIX = "Volume Preifx";
private static final String H_VOLUME_PREFIX = "Volume Prefix";
private static final String H_URL = "URL of OpenIO";
private static final String H_PROXY_PORT = "Proxy port";
private static final String H_ACCOUNT_PORT = "Account port";
private static final String H_ACCOUNT = "Name of account";
private static final String H_NAME_SPACE = "Namespace";
private static final String H_STORE_MANAGER_CLASS = "Optional parameter to specify non-default store manager class path";
private static final String H_USE_INFREQUENT_ACCESS_THRESHOLD = "Use Infrequent access storage class blob size threshold";
private static final String H_USE_INFREQUENT_ACCESS = "Use Infrequent access storage class - AWS only";
private static final String H_USE_INTELLIGENT_TIERING = "Use Intelligent tiering storage class - AWS only";
private static final String A_ID = "id";
private static final String A_TYPE = "type";
private static final String A_PATH = "path";
Expand All @@ -108,12 +118,17 @@ public final class VolumeCLI extends SoapCLI {
private static final String A_STORAGE_TYPE = "storageType";
private static final String A_BUCKET_ID = "bucketId";
private static final String A_VOLUME_PREFIX = "volumePrefix";
private static final String A_USE_IN_FRE_ACCESS_THRESHOLD = "useInFrequentAccThr";



private static final String A_URL = "url";
private static final String A_PROXY_PORT = "proxyPort";
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 {
super();
Expand All @@ -139,6 +154,10 @@ private VolumeCLI() throws ServiceException {
private String nameSpace;
private String account;
private String storeManagerClass;

private String useInfrequentAccess;
private String useInfrequentAccessThreshold;
private String useIntelligentTiering;

private void setArgs(CommandLine cl) throws ServiceException, ParseException, IOException {
auth = getZAuthToken(cl);
Expand All @@ -159,6 +178,9 @@ private void setArgs(CommandLine cl) throws ServiceException, ParseException, IO
nameSpace = cl.getOptionValue(O_NS);
account = cl.getOptionValue(O_ACCOUNT);
storeManagerClass = cl.getOptionValue(O_SMC);
useInfrequentAccess = cl.getOptionValue(O_UFA);
useInfrequentAccessThreshold = cl.getOptionValue(O_UFAT);
useIntelligentTiering = cl.getOptionValue(O_UIT);
}

public static void main(String[] args) {
Expand Down Expand Up @@ -261,14 +283,15 @@ 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.print(" compressed: " + vol.isCompressBlobs());
System.out.println(" compressed: " + vol.isCompressBlobs());

if (vol.isCompressBlobs()) {
System.out.println("\t threshold: " + vol.getCompressionThreshold() + " bytes");
} else {
System.out.println();
}
System.out.println(" current: " + vol.isCurrent());
System.out.println(" storeManagerClass: " + vol.getStoreManagerClass());
if (vol.getStoreType() == Volume.StoreType.EXTERNAL.getStoreType()) {
if (AdminConstants.A_VOLUME_S3.equals(extractStorageType(vol))) {
VolumeExternalInfo volumeExternalInfo = vol.getVolumeExternalInfo();
Expand Down Expand Up @@ -482,13 +505,32 @@ private void validateAddCommand(VolumeInfo volumeInfo) throws ParseException {
if (!Strings.isNullOrEmpty(volumePrefix)) {
volumeExternalInfo.setVolumePrefix(volumePrefix);
}
if (!Strings.isNullOrEmpty(useInfrequentAccess)
&& validateBoolean(AdminConstants.A_VOLUME_USE_IN_FREQ_ACCESS, useInfrequentAccess)) {
volumeExternalInfo.setUseInFrequentAccess(Boolean.parseBoolean(useInfrequentAccess));
}
if (!Strings.isNullOrEmpty(useIntelligentTiering)
&& validateBoolean(AdminConstants.A_VOLUME_USE_INTELLIGENT_TIERING, useIntelligentTiering)) {
volumeExternalInfo.setUseIntelligentTiering(Boolean.parseBoolean(useIntelligentTiering));
}
if (!Strings.isNullOrEmpty(useInfrequentAccessThreshold)) {
volumeExternalInfo.setUseInFrequentAccessThreshold(Integer.parseInt(useInfrequentAccessThreshold));
}
volumeInfo.setVolumeExternalInfo(volumeExternalInfo);
}
volumeInfo.setStoreType((short) Volume.StoreType.EXTERNAL.getStoreType());
} else {
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);

}

@Override
protected String getCommandUsage() {
Expand Down Expand Up @@ -521,6 +563,9 @@ protected void setupCommandLineOptions() {
options.addOption(new Option(O_VP, A_VOLUME_PREFIX, true, H_VOLUME_PREFIX));
options.addOption(new Option(O_STP, A_STORAGE_TYPE, true, H_STORAGE_TYPE));
options.addOption(new Option(O_BID, A_BUCKET_ID, true, H_BUCKET_ID));
options.addOption(new Option(O_UFA, AdminConstants.A_VOLUME_USE_IN_FREQ_ACCESS, true, H_USE_INFREQUENT_ACCESS));
options.addOption(new Option(O_UFAT, A_USE_IN_FRE_ACCESS_THRESHOLD, true, H_USE_INFREQUENT_ACCESS_THRESHOLD));
options.addOption(new Option(O_UIT, AdminConstants.A_VOLUME_USE_INTELLIGENT_TIERING, true, H_USE_INTELLIGENT_TIERING));
//OpenIO
options.addOption(new Option(O_AP, A_ACCOUNT_PORT, true, H_ACCOUNT_PORT));
options.addOption(new Option(O_PP, A_PROXY_PORT, true, H_PROXY_PORT));
Expand Down Expand Up @@ -564,6 +609,9 @@ protected void usage(ParseException e) {
printOpt(O_VP, 0);
printOpt(O_STP, 0);
printOpt(O_BID, 0);
printOpt(O_UIT, 0);
printOpt(O_UFA, 0);
printOpt(O_UFAT, 0);

printOpt(O_PP, 0);
printOpt(O_AP, 0);
Expand Down

0 comments on commit cf827d1

Please sign in to comment.