From 85c67f6d26bf3fafd4459ab0e1fade98d62bfe3d Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Wed, 2 Jul 2025 22:10:23 +0000 Subject: [PATCH 1/7] Updated versions of dependencies to match Accumulo 2.1.4. Proxy does NOT build currently --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ab74d73..f73725f 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ https://github.com/apache/accumulo-proxy/actions - 2.1.3 + 2.1.4 contrib/Eclipse-Accumulo-Codestyle.xml @@ -94,7 +94,7 @@ 11 11 11 - 2.0.12 + 2.0.17 source-release-tar src/main/spotbugs/exclude-filter.xml 0.17.0 @@ -104,14 +104,14 @@ io.micrometer micrometer-bom - 1.12.2 + 1.14.5 pom import org.apache.logging.log4j log4j-bom - 2.23.1 + 2.24.3 pom import @@ -139,7 +139,7 @@ com.google.guava guava - 32.0.0-jre + 33.4.6-jre commons-lang @@ -218,7 +218,7 @@ org.easymock easymock - 5.1.0 + 5.5.0 test From 9609a724aa975a42f19c616c84bbf8c62f99af54 Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Wed, 2 Jul 2025 22:13:00 +0000 Subject: [PATCH 2/7] Removed unnecessary methods from stub Metrics Info class. --- .../java/org/apache/accumulo/proxy/Proxy.java | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java index b4020d4..fedd623 100644 --- a/src/main/java/org/apache/accumulo/proxy/Proxy.java +++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java @@ -23,7 +23,6 @@ import java.io.UncheckedIOException; import java.nio.file.Files; import java.util.Collection; -import java.util.List; import java.util.Properties; import org.apache.accumulo.core.cli.Help; @@ -59,7 +58,6 @@ import com.google.auto.service.AutoService; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; @AutoService(KeywordExecutable.class) @@ -274,44 +272,19 @@ public boolean isMetricsEnabled() { return false; } - @Override - public void addServiceTags(String applicationName, HostAndPort hostAndPort) { - throw new UnsupportedOperationException("Unimplemented method 'addServiceTags'"); - } - - @Override - public void addCommonTags(List updates) { - throw new UnsupportedOperationException("Unimplemented method 'addCommonTags'"); - } - - @Override - public Collection getCommonTags() { - throw new UnsupportedOperationException("Unimplemented method 'getCommonTags'"); - } - - @Override - public void addRegistry(MeterRegistry registry) { - throw new UnsupportedOperationException("Unimplemented method 'addRegistry'"); - } - @Override public void addMetricsProducers(MetricsProducer... producer) { return; } @Override - public void init() { - throw new UnsupportedOperationException("Unimplemented method 'init'"); - } - - @Override - public MeterRegistry getRegistry() { - throw new UnsupportedOperationException("Unimplemented method 'getRegistry'"); + public void close() { + throw new UnsupportedOperationException("Unimplemented method 'close'"); } @Override - public void close() { - throw new UnsupportedOperationException("Unimplemented method 'close'"); + public void init(Collection commonTags) { + throw new UnsupportedOperationException("Unimplemented method 'init'"); } } From fc2e57b38c164cb1ff890b9292ddb544c58a9e1b Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Wed, 2 Jul 2025 22:54:25 +0000 Subject: [PATCH 3/7] Updated the junit.jupiter version. In TServerUtils, used the new createNonCritialThread function instead of the removed createThread function. Corrected the order of parameters for Halt.halt. --- pom.xml | 2 +- src/main/java/org/apache/accumulo/proxy/TServerUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f73725f..cbbe172 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ org.junit.jupiter junit-jupiter-api - 5.10.1 + 5.12.1 test diff --git a/src/main/java/org/apache/accumulo/proxy/TServerUtils.java b/src/main/java/org/apache/accumulo/proxy/TServerUtils.java index 6c4af19..fe24f5d 100644 --- a/src/main/java/org/apache/accumulo/proxy/TServerUtils.java +++ b/src/main/java/org/apache/accumulo/proxy/TServerUtils.java @@ -505,11 +505,11 @@ public static ServerAddress startTServer(ThriftServerType serverType, TimedProce final TServer finalServer = serverAddress.server; - Threads.createThread(threadName, () -> { + Threads.createNonCriticalThread(threadName, () -> { try { finalServer.serve(); } catch (Error e) { - Halt.halt("Unexpected error in TThreadPoolServer " + e + ", halting.", 1); + Halt.halt(1, "Unexpected error in TThreadPoolServer " + e + ", halting."); } }).start(); From 9512ee34b37a71d242edba6ac07715965f625b9f Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Wed, 2 Jul 2025 22:58:31 +0000 Subject: [PATCH 4/7] Updated comment for stub MetricsInfo. Confirmed that proxy builds. --- src/main/java/org/apache/accumulo/proxy/Proxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java index fedd623..91d74e2 100644 --- a/src/main/java/org/apache/accumulo/proxy/Proxy.java +++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java @@ -263,8 +263,8 @@ public static ServerAddress createProxyServer(HostAndPort address, serverSocketTimeout, address); } - // TODO: This MetricsInfo is a stub Metrics Info to allow the timed processor to build. If Metrics - // are wanted or needed in a later version of the proxy, this can be updated. + // This MetricsInfo is a stub MetricsInfo to allow the timed processor to build. + // Issue #85 in the GitHub regards updating this with a proper implementation. static private class ProxyMetricsInfo implements MetricsInfo { @Override From e7c0ea52565e3d0001eb02e1542d86866dac1e09 Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Fri, 22 Aug 2025 03:03:31 +0000 Subject: [PATCH 5/7] Added some white space --- DOCKER.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DOCKER.md b/DOCKER.md index 544a4dd..45d17b8 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -15,6 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + # accumulo-proxy-docker This documentation covers how to stand up [accumulo-proxy](https://github.com/apache/accumulo-proxy/) within a Docker container. From 09316989810cc0ab8c22d03d6b7172b9c4271e7f Mon Sep 17 00:00:00 2001 From: Robert Kurc Date: Fri, 22 Aug 2025 03:04:04 +0000 Subject: [PATCH 6/7] Removed some white space --- DOCKER.md | 1 - 1 file changed, 1 deletion(-) diff --git a/DOCKER.md b/DOCKER.md index 45d17b8..544a4dd 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - # accumulo-proxy-docker This documentation covers how to stand up [accumulo-proxy](https://github.com/apache/accumulo-proxy/) within a Docker container. From f1ca703743a749ed66d5c3670c352b69d431ce4e Mon Sep 17 00:00:00 2001 From: Robert Kurc <145068316+Kidcredible300@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:19:39 -0400 Subject: [PATCH 7/7] Update Spotbugs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 664d3af..5674094 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.3 + 4.9.3 true