HDDS-738. Removing REST protocol support from OzoneClient

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java

@@ -125,9 +125,6 @@ public final class OzoneConfigKeys {
    * */
   public static final String OZONE_ADMINISTRATORS_WILDCARD = "*";
 
-  public static final String OZONE_CLIENT_PROTOCOL =
-      "ozone.client.protocol";
-
   public static final String OZONE_CLIENT_STREAM_BUFFER_FLUSH_SIZE =
       "ozone.client.stream.buffer.flush.size";
 

hadoop-hdds/common/src/main/resources/ozone-default.xml

@@ -1261,7 +1261,7 @@
 
   <property>
     <name>hdds.datanode.plugins</name>
-    <value>org.apache.hadoop.ozone.web.OzoneHddsDatanodeService</value>
+    <value></value>
     <description>
       Comma-separated list of HDDS datanode plug-ins to be activated when
       HDDS service starts as part of datanode.

hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientException.java

@@ -17,38 +17,27 @@
  */
 package org.apache.hadoop.ozone.client;
 
-import org.apache.hadoop.ozone.client.rest.OzoneException;
-
 /**
  * This exception is thrown by the Ozone Clients.
  */
-public class OzoneClientException extends OzoneException {
-  /**
-   * Constructor that allows the shortMessage.
-   *
-   * @param shortMessage Short Message
-   */
-  public OzoneClientException(String shortMessage) {
-    super(0, shortMessage, shortMessage);
+public class OzoneClientException extends Exception {
+  public OzoneClientException() {
+  }
+
+  public OzoneClientException(String s) {
+    super(s);
+  }
+
+  public OzoneClientException(String s, Throwable throwable) {
+    super(s, throwable);
   }
 
-  /**
-   * Constructor that allows a shortMessage and an exception.
-   *
-   * @param shortMessage short message
-   * @param ex exception
-   */
-  public OzoneClientException(String shortMessage, Exception ex) {
-    super(0, shortMessage, shortMessage, ex);
+  public OzoneClientException(Throwable throwable) {
+    super(throwable);
   }
 
-  /**
-   * Constructor that allows the shortMessage and a longer message.
-   *
-   * @param shortMessage Short Message
-   * @param message long error message
-   */
-  public OzoneClientException(String shortMessage, String message) {
-    super(0, shortMessage, message);
+  public OzoneClientException(String s, Throwable throwable, boolean b,
+      boolean b1) {
+    super(s, throwable, b, b1);
   }
 }

hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java

@@ -23,20 +23,16 @@
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
-import org.apache.hadoop.ozone.client.rest.RestClient;
 import org.apache.hadoop.ozone.client.rpc.RpcClient;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_PROTOCOL;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_ADDRESS_KEY;
 
 /**
  * Factory class to create different types of OzoneClients.
@@ -87,9 +83,7 @@ public static OzoneClient getClient() throws IOException {
   public static OzoneClient getClient(Configuration config)
       throws IOException {
     Preconditions.checkNotNull(config);
-    Class<? extends ClientProtocol> clazz = (Class<? extends ClientProtocol>)
-        config.getClass(OZONE_CLIENT_PROTOCOL, RpcClient.class);
-    return getClient(getClientProtocol(clazz, config), config);
+    return getClient(getClientProtocol(config), config);
   }
 
   /**
@@ -166,85 +160,7 @@ public static OzoneClient getRpcClient(String omHost, Integer omRpcPort,
   public static OzoneClient getRpcClient(Configuration config)
       throws IOException {
     Preconditions.checkNotNull(config);
-    return getClient(getClientProtocol(RpcClient.class, config),
-        config);
-  }
-
-  /**
-   * Returns an OzoneClient which will use REST protocol.
-   *
-   * @param omHost
-   *        hostname of OzoneManager to connect.
-   *
-   * @return OzoneClient
-   *
-   * @throws IOException
-   */
-  public static OzoneClient getRestClient(String omHost)
-      throws IOException {
-    Configuration config = new OzoneConfiguration();
-    int port = OmUtils.getOmRestPort(config);
-    return getRestClient(omHost, port, config);
-  }
-
-  /**
-   * Returns an OzoneClient which will use REST protocol.
-   *
-   * @param omHost
-   *        hostname of OzoneManager to connect.
-   *
-   * @param omHttpPort
-   *        HTTP port of OzoneManager.
-   *
-   * @return OzoneClient
-   *
-   * @throws IOException
-   */
-  public static OzoneClient getRestClient(String omHost, Integer omHttpPort)
-      throws IOException {
-    return getRestClient(omHost, omHttpPort, new OzoneConfiguration());
-  }
-
-  /**
-   * Returns an OzoneClient which will use REST protocol.
-   *
-   * @param omHost
-   *        hostname of OzoneManager to connect.
-   *
-   * @param omHttpPort
-   *        HTTP port of OzoneManager.
-   *
-   * @param config
-   *        Configuration to be used for OzoneClient creation
-   *
-   * @return OzoneClient
-   *
-   * @throws IOException
-   */
-  public static OzoneClient getRestClient(String omHost, Integer omHttpPort,
-                                          Configuration config)
-      throws IOException {
-    Preconditions.checkNotNull(omHost);
-    Preconditions.checkNotNull(omHttpPort);
-    Preconditions.checkNotNull(config);
-    config.set(OZONE_OM_HTTP_ADDRESS_KEY, omHost + ":" + omHttpPort);
-    return getRestClient(config);
-  }
-
-  /**
-   * Returns an OzoneClient which will use REST protocol.
-   *
-   * @param config
-   *        Configuration to be used for OzoneClient creation
-   *
-   * @return OzoneClient
-   *
-   * @throws IOException
-   */
-  public static OzoneClient getRestClient(Configuration config)
-      throws IOException {
-    Preconditions.checkNotNull(config);
-    return getClient(getClientProtocol(RestClient.class, config),
+    return getClient(getClientProtocol(config),
         config);
   }
 
@@ -270,8 +186,6 @@ private static OzoneClient getClient(ClientProtocol clientProtocol,
   /**
    * Returns an instance of Protocol class.
    *
-   * @param protocolClass
-   *        Class object of the ClientProtocol.
    *
    * @param config
    *        Configuration used to initialize ClientProtocol.
@@ -280,23 +194,15 @@ private static OzoneClient getClient(ClientProtocol clientProtocol,
    *
    * @throws IOException
    */
-  private static ClientProtocol getClientProtocol(
-      Class<? extends ClientProtocol> protocolClass, Configuration config)
+  private static ClientProtocol getClientProtocol(Configuration config)
       throws IOException {
     try {
-      LOG.debug("Using {} as client protocol.",
-          protocolClass.getCanonicalName());
-      Constructor<? extends ClientProtocol> ctor =
-          protocolClass.getConstructor(Configuration.class);
-      return ctor.newInstance(config);
+      return new RpcClient(config);
     } catch (Exception e) {
-      final String message = "Couldn't create protocol " + protocolClass;
+      final String message = "Couldn't create RpcClient protocol";
       LOG.error(message + " exception: ", e);
       if (e.getCause() instanceof IOException) {
         throw (IOException) e.getCause();
-      } else if (e instanceof InvocationTargetException) {
-        throw new IOException(message,
-            ((InvocationTargetException) e).getTargetException());
       } else {
         throw new IOException(message, e);
       }

hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientUtils.java

@@ -17,106 +17,15 @@
  */
 package org.apache.hadoop.ozone.client;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.hadoop.hdds.client.OzoneQuota;
-import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
 import org.apache.hadoop.io.retry.RetryPolicies;
 import org.apache.hadoop.io.retry.RetryPolicy;
-import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.client.rest.response.BucketInfo;
-import org.apache.hadoop.ozone.client.rest.response.KeyInfo;
-import org.apache.hadoop.ozone.client.rest.response.KeyInfoDetails;
-import org.apache.hadoop.ozone.client.rest.response.KeyLocation;
-import org.apache.hadoop.ozone.client.rest.response.VolumeInfo;
-import org.apache.hadoop.ozone.client.rest.response.VolumeOwner;
 
 /** A utility class for OzoneClient. */
 public final class OzoneClientUtils {
 
   private OzoneClientUtils() {}
-  /**
-   * Returns a BucketInfo object constructed using fields of the input
-   * OzoneBucket object.
-   *
-   * @param bucket OzoneBucket instance from which BucketInfo object needs to
-   *               be created.
-   * @return BucketInfo instance
-   */
-  public static BucketInfo asBucketInfo(OzoneBucket bucket) throws IOException {
-    BucketInfo bucketInfo =
-        new BucketInfo(bucket.getVolumeName(), bucket.getName());
-    bucketInfo
-        .setCreatedOn(HddsClientUtils.formatDateTime(bucket.getCreationTime()));
-    bucketInfo.setStorageType(bucket.getStorageType());
-    bucketInfo.setVersioning(
-        OzoneConsts.Versioning.getVersioning(bucket.getVersioning()));
-    bucketInfo.setEncryptionKeyName(
-        bucket.getEncryptionKeyName()==null? "N/A" :
-            bucket.getEncryptionKeyName());
-    return bucketInfo;
-  }
-
-  /**
-   * Returns a VolumeInfo object constructed using fields of the input
-   * OzoneVolume object.
-   *
-   * @param volume OzoneVolume instance from which VolumeInfo object needs to
-   *               be created.
-   * @return VolumeInfo instance
-   */
-  public static VolumeInfo asVolumeInfo(OzoneVolume volume) {
-    VolumeInfo volumeInfo = new VolumeInfo(volume.getName(),
-        HddsClientUtils.formatDateTime(volume.getCreationTime()),
-        volume.getOwner());
-    volumeInfo.setQuota(OzoneQuota.getOzoneQuota(volume.getQuota()));
-    volumeInfo.setOwner(new VolumeOwner(volume.getOwner()));
-    return volumeInfo;
-  }
-
-  /**
-   * Returns a KeyInfo object constructed using fields of the input
-   * OzoneKey object.
-   *
-   * @param key OzoneKey instance from which KeyInfo object needs to
-   *            be created.
-   * @return KeyInfo instance
-   */
-  public static KeyInfo asKeyInfo(OzoneKey key) {
-    KeyInfo keyInfo = new KeyInfo();
-    keyInfo.setKeyName(key.getName());
-    keyInfo.setCreatedOn(HddsClientUtils.formatDateTime(key.getCreationTime()));
-    keyInfo.setModifiedOn(
-        HddsClientUtils.formatDateTime(key.getModificationTime()));
-    keyInfo.setSize(key.getDataSize());
-    return keyInfo;
-  }
-
-  /**
-   * Returns a KeyInfoDetails object constructed using fields of the input
-   * OzoneKeyDetails object.
-   *
-   * @param key OzoneKeyDetails instance from which KeyInfo object needs to
-   *            be created.
-   * @return KeyInfoDetails instance
-   */
-  public static KeyInfoDetails asKeyInfoDetails(OzoneKeyDetails key) {
-    KeyInfoDetails keyInfo = new KeyInfoDetails();
-    keyInfo.setKeyName(key.getName());
-    keyInfo.setCreatedOn(HddsClientUtils.formatDateTime(key.getCreationTime()));
-    keyInfo.setModifiedOn(
-        HddsClientUtils.formatDateTime(key.getModificationTime()));
-    keyInfo.setSize(key.getDataSize());
-    List<KeyLocation> keyLocations = new ArrayList<>();
-    key.getOzoneKeyLocations().forEach((a) -> keyLocations.add(new KeyLocation(
-        a.getContainerID(), a.getLocalID(), a.getLength(), a.getOffset())));
-    keyInfo.setKeyLocation(keyLocations);
-    keyInfo.setFileEncryptionInfo(key.getFileEncryptionInfo());
-    return keyInfo;
-  }
 
   public static RetryPolicy createRetryPolicy(int maxRetryCount,
       long retryInterval) {