fix ConnectionImplementation constructor, mostly relates to tests

Author: Ray Mattingly

hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java

@@ -280,14 +280,6 @@ public class ConnectionImplementation implements ClusterConnection, Closeable {
 
   private ChoreService choreService;
 
-  /**
-   * constructor
-   * @param conf Configuration object
-   */
-  ConnectionImplementation(Configuration conf, ExecutorService pool, User user) throws IOException {
-    this(conf, pool, user, null, Collections.emptyMap());
-  }
-
   /**
    * constructor
    * @param conf Configuration object

hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java

@@ -27,6 +27,7 @@
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -140,8 +141,9 @@ public static void setupMasterlessConnection(Configuration conf) {
    * region re-lookups.
    */
   static class MasterlessConnection extends ConnectionImplementation {
-    MasterlessConnection(Configuration conf, ExecutorService pool, User user) throws IOException {
-      super(conf, pool, user);
+    MasterlessConnection(Configuration conf, ExecutorService pool, User user,
+      Map<String, byte[]> requestAttributes) throws IOException {
+      super(conf, pool, user, requestAttributes);
     }
 
     @Override

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java

@@ -526,7 +526,7 @@ public CompletableFuture<String> getClusterId() {
     final AtomicInteger nbThreads = new AtomicInteger(0);
 
     protected MyConnectionImpl(Configuration conf) throws IOException {
-      super(setupConf(conf), null, null);
+      super(setupConf(conf), null, null, Collections.emptyMap());
     }
 
     private static Configuration setupConf(Configuration conf) {

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java

@@ -329,9 +329,9 @@ public void testConnectionClosedOnRegionLocate() throws IOException {
   static class RegionServerStoppedOnScannerOpenConnection extends ConnectionImplementation {
     final ClientService.BlockingInterface stub;
 
-    RegionServerStoppedOnScannerOpenConnection(Configuration conf, ExecutorService pool, User user)
-      throws IOException {
-      super(conf, pool, user);
+    RegionServerStoppedOnScannerOpenConnection(Configuration conf, ExecutorService pool, User user,
+      Map<String, byte[]> requestAttributes) throws IOException {
+      super(conf, pool, user, requestAttributes);
       // Mock up my stub so open scanner returns a scanner id and then on next, we throw
       // exceptions for three times and then after that, we return no more to scan.
       this.stub = Mockito.mock(ClientService.BlockingInterface.class);
@@ -360,8 +360,9 @@ public BlockingInterface getClient(ServerName sn) throws IOException {
   static class RpcTimeoutConnection extends ConnectionImplementation {
     final ClientService.BlockingInterface stub;
 
-    RpcTimeoutConnection(Configuration conf, ExecutorService pool, User user) throws IOException {
-      super(conf, pool, user);
+    RpcTimeoutConnection(Configuration conf, ExecutorService pool, User user,
+      Map<String, byte[]> requestAttributes) throws IOException {
+      super(conf, pool, user, requestAttributes);
       // Mock up my stub so an exists call -- which turns into a get -- throws an exception
       this.stub = Mockito.mock(ClientService.BlockingInterface.class);
       try {

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionImplementationTracing.java

@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
+import java.util.Collections;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.security.UserProvider;
@@ -44,7 +45,8 @@ public class TestConnectionImplementationTracing extends TestTracingBase {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    conn = new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent());
+    conn = new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent(),
+      Collections.emptyMap());
   }
 
   @After

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableTracing.java

@@ -44,6 +44,7 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -191,35 +192,34 @@ public GetResponse answer(InvocationOnMock invocation) throws Throwable {
       }
     }).when(stub).get(any(HBaseRpcController.class), any(GetRequest.class));
 
-    conn =
-      spy(new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent()) {
-        @Override
-        public RegionLocator getRegionLocator(TableName tableName) throws IOException {
-          RegionLocator locator = mock(HRegionLocator.class);
-          Answer<HRegionLocation> answer = new Answer<HRegionLocation>() {
-
-            @Override
-            public HRegionLocation answer(InvocationOnMock invocation) throws Throwable {
-              TableName tableName = TableName.META_TABLE_NAME;
-              RegionInfo info = RegionInfoBuilder.newBuilder(tableName).build();
-              ServerName serverName = MASTER_HOST;
-              HRegionLocation loc = new HRegionLocation(info, serverName);
-              return loc;
-            }
-          };
-          doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyInt(),
-            anyBoolean());
-          doAnswer(answer).when(locator).getRegionLocation(any(byte[].class));
-          doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyInt());
-          doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyBoolean());
-          return locator;
-        }
+    conn = spy(new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent(),
+      Collections.emptyMap()) {
+      @Override
+      public RegionLocator getRegionLocator(TableName tableName) throws IOException {
+        RegionLocator locator = mock(HRegionLocator.class);
+        Answer<HRegionLocation> answer = new Answer<HRegionLocation>() {
+
+          @Override
+          public HRegionLocation answer(InvocationOnMock invocation) throws Throwable {
+            TableName tableName = TableName.META_TABLE_NAME;
+            RegionInfo info = RegionInfoBuilder.newBuilder(tableName).build();
+            ServerName serverName = MASTER_HOST;
+            HRegionLocation loc = new HRegionLocation(info, serverName);
+            return loc;
+          }
+        };
+        doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyInt(), anyBoolean());
+        doAnswer(answer).when(locator).getRegionLocation(any(byte[].class));
+        doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyInt());
+        doAnswer(answer).when(locator).getRegionLocation(any(byte[].class), anyBoolean());
+        return locator;
+      }
 
-        @Override
-        public ClientService.BlockingInterface getClient(ServerName serverName) throws IOException {
-          return stub;
-        }
-      });
+      @Override
+      public ClientService.BlockingInterface getClient(ServerName serverName) throws IOException {
+        return stub;
+      }
+    });
     // this setup of AsyncProcess is for MultiResponse
     AsyncProcess asyncProcess = mock(AsyncProcess.class);
     AsyncRequestFuture asyncRequestFuture = mock(AsyncRequestFuture.class);

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestRegionLocatorTracing.java

@@ -32,6 +32,7 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionLocation;
@@ -59,7 +60,8 @@ public class TestRegionLocatorTracing extends TestTracingBase {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    conn = new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent());
+    conn = new ConnectionImplementation(conf, null, UserProvider.instantiate(conf).getCurrent(),
+      Collections.emptyMap());
   }
 
   @After

hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java

@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.hadoop.conf.Configuration;
@@ -149,7 +150,7 @@ public static ClusterConnection getMockedConnectionAndDecorate(final Configurati
    */
   public static ClusterConnection getSpiedConnection(final Configuration conf) throws IOException {
     ConnectionImplementation connection =
-      Mockito.spy(new ConnectionImplementation(conf, null, null));
+      Mockito.spy(new ConnectionImplementation(conf, null, null, Collections.emptyMap()));
     return connection;
   }