Update to accumulo 2.1.1 (#81)

* Moved TServerUtils into proxy code to maintain support for other Thrift Protocols --------- Co-authored-by: magrable <[email protected]>
apache · Dec 2, 2024 · 63c9d52 · 63c9d52
1 parent 8ce5a0a
commit 63c9d52
Show file tree

Hide file tree

Showing 4 changed files with 529 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,12 +21,12 @@ WORKDIR /opt/accumulo-proxy
 
 ARG HADOOP_VERSION=3.3.4
 ARG ZOOKEEPER_VERSION=3.8.0
-ARG ACCUMULO_VERSION=2.1.0
+ARG ACCUMULO_VERSION=2.1.1
 ARG ACCUMULO_PROXY_VERSION=2.0.0-SNAPSHOT
 
 ARG HADOOP_HASH=ca5e12625679ca95b8fd7bb7babc2a8dcb2605979b901df9ad137178718821097b67555115fafc6dbf6bb32b61864ccb6786dbc555e589694a22bf69147780b4
 ARG ZOOKEEPER_HASH=d66e3a40451f840406901b2cd940992b001f92049a372ae48d8b420891605871cd1ae5f6cceb3b10665491e7abef36a4078dace158bd1e0938fcd3567b5234ca
-ARG ACCUMULO_HASH=9bbc4defc114013f145e9e9fdd08683c842a29faaa01ea6e80555549a6aecef86ee6657cce23183b411a64c31123db682a6944e2825eef83c76fb5a91620235f
+ARG ACCUMULO_HASH=adb23e56362c2e3e813d07791389b8ca2d5976df8b00a29b607e6ae05ea465eff80ada6d1ec9a9c596df8b4066c51078cd5a4006dc78568ac38f638a1d3895be
 
 # Download from Apache mirrors instead of archive #9
 ENV APACHE_DIST_URLS \

diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
     <url>https://github.com/apache/accumulo-proxy/actions</url>
   </ciManagement>
   <properties>
-    <accumulo.version>2.1.0</accumulo.version>
+    <accumulo.version>2.1.1</accumulo.version>
     <eclipseFormatterStyle>contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
     <!-- extra release args for testing -->
     <extraReleaseArguments />

diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -38,7 +38,6 @@
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
 import org.apache.accumulo.server.rpc.SaslServerConnectionParams;
 import org.apache.accumulo.server.rpc.ServerAddress;
-import org.apache.accumulo.server.rpc.TServerUtils;
 import org.apache.accumulo.server.rpc.ThriftServerType;
 import org.apache.accumulo.server.rpc.TimedProcessor;
 import org.apache.accumulo.server.rpc.UGIAssumingProcessor;
@@ -251,10 +250,9 @@ public static ServerAddress createProxyServer(HostAndPort address,
         break;
     }
 
-    TimedProcessor timedProcessor = new TimedProcessor(processor, serverName, threadName);
+    TimedProcessor timedProcessor = new TimedProcessor(processor);
 
     // Create the thrift server with our processor and properties
-
     return TServerUtils.startTServer(serverType, timedProcessor, protocolFactory, serverName,
         threadName, numThreads, ThreadPools.DEFAULT_TIMEOUT_MILLISECS,
         ClientConfConverter.toAccumuloConf(props), 1000L, maxFrameSize, sslParams, saslParams,