HDDS-6407. Unwrap RemoteException in getClientProtocol

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

@@ -26,6 +26,7 @@
 import org.apache.hadoop.hdds.conf.ConfigurationSource;
 import org.apache.hadoop.hdds.conf.MutableConfigurationSource;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
@@ -247,7 +248,9 @@ private static ClientProtocol getClientProtocol(ConfigurationSource config,
     } catch (Exception e) {
       final String message = "Couldn't create RpcClient protocol";
       LOG.error(message + " exception: ", e);
-      if (e.getCause() instanceof IOException) {
+      if (e instanceof RemoteException) {
+        throw ((RemoteException) e).unwrapRemoteException();
+      } else if (e.getCause() instanceof IOException) {
         throw (IOException) e.getCause();
       } else {
         throw new IOException(message, e);

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/TestOzoneClientFactory.java

@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.hadoop.ozone.client;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.security.PrivilegedExceptionAction;
+import java.util.UUID;
+
+/**
+ * Test implementation for OzoneClientFactory.
+ */
+public class TestOzoneClientFactory {
+
+  private static String scmId = UUID.randomUUID().toString();
+  private static String clusterId = UUID.randomUUID().toString();
+
+  @Test
+  public void testRemoteException() {
+
+    OzoneConfiguration conf = new OzoneConfiguration();
+
+    try {
+      MiniOzoneCluster cluster = MiniOzoneCluster.newBuilder(conf)
+          .setNumDatanodes(3)
+          .setTotalPipelineNumLimit(10)
+          .setScmId(scmId)
+          .setClusterId(clusterId)
+          .build();
+
+      String omPort = cluster.getOzoneManager().getRpcPort();
+
+      UserGroupInformation realUser =
+          UserGroupInformation.createRemoteUser("realUser");
+      UserGroupInformation proxyUser = UserGroupInformation.createProxyUser(
+          "user", realUser);
+      proxyUser.doAs(new PrivilegedExceptionAction<Void>() {
+        @Override
+        public Void run() throws IOException {
+          conf.set("ozone.security.enabled", "true");
+          OzoneClient ozoneClient =
+              OzoneClientFactory.getRpcClient("localhost",
+                  Integer.parseInt(omPort),
+                  conf);
+          ozoneClient.getObjectStore().listVolumes("/");
+          return null;
+        }
+      });
+      Assert.fail("Should throw exception here");
+    } catch (IOException | InterruptedException e) {
+      assert e instanceof AccessControlException;
+    }
+  }
+
+}