From c649748eabd727a6c49ad2cfd61168830d942786 Mon Sep 17 00:00:00 2001 From: Dmitry Kryukov Date: Tue, 25 Jun 2024 21:17:43 +0300 Subject: [PATCH 1/2] [Improvement] Removed unused/non-updated objects --- .../main/java/org/apache/distributedlog/LocalDLMEmulator.java | 4 ---- .../distributedlog/config/DynamicConfigurationFactory.java | 3 --- .../apache/bookkeeper/tests/containers/ChaosContainer.java | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java index b9a6bb5c4ab..a14c6d50e3c 100644 --- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java +++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/LocalDLMEmulator.java @@ -61,7 +61,6 @@ public class LocalDLMEmulator { private final String zkEnsemble; private final URI uri; - private final List tmpDirs = new ArrayList(); private final int zkTimeoutSec; private final Thread bkStartupThread; private final String zkHost; @@ -180,9 +179,6 @@ public void teardown() throws Exception { bkStartupThread.interrupt(); bkStartupThread.join(); } - for (File dir : tmpDirs) { - FileUtils.forceDeleteOnExit(dir); - } } public String getZkServers() { diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/config/DynamicConfigurationFactory.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/config/DynamicConfigurationFactory.java index 7ef062fb604..4b1b3752966 100644 --- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/config/DynamicConfigurationFactory.java +++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/config/DynamicConfigurationFactory.java @@ -49,7 +49,6 @@ public class DynamicConfigurationFactory { private static final Logger LOG = LoggerFactory.getLogger(DynamicConfigurationFactory.class); private final Map dynamicConfigs; - private final List subscriptions; private final ScheduledExecutorService executorService; private final int reloadPeriod; private final TimeUnit reloadUnit; @@ -60,7 +59,6 @@ public DynamicConfigurationFactory(ScheduledExecutorService executorService, this.reloadPeriod = reloadPeriod; this.reloadUnit = reloadUnit; this.dynamicConfigs = new HashMap(); - this.subscriptions = new LinkedList(); } public synchronized Optional getDynamicConfiguration( @@ -77,7 +75,6 @@ public synchronized Optional getDynamicConfi List fileConfigBuilders = Lists.newArrayList(properties); ConfigurationSubscription subscription = new ConfigurationSubscription( dynConf, fileConfigBuilders, executorService, reloadPeriod, reloadUnit); - subscriptions.add(subscription); dynamicConfigs.put(configPath, dynConf); LOG.info("Loaded dynamic configuration at {}", configPath); } diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java index 35d3023381c..2ec4297ac12 100644 --- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java +++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java @@ -85,7 +85,6 @@ public void tailContainerLog() { } public String getContainerLog() { - StringBuilder sb = new StringBuilder(); LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(this.getContainerId()); logContainerCmd.withStdOut(true).withStdErr(true); @@ -94,7 +93,7 @@ public String getContainerLog() { } catch (InterruptedException e) { } - return sb.toString(); + return ""; } public ExecResult execCmd(String... cmd) throws Exception { From 4bc3d9da58abdf5dff850b2d1f818846a57ee5bb Mon Sep 17 00:00:00 2001 From: Dmitry Kryukov Date: Mon, 21 Oct 2024 22:49:50 +0300 Subject: [PATCH 2/2] Removed unused method getContainerLog() --- .../bookkeeper/tests/containers/ChaosContainer.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java index 2ec4297ac12..4a1fbd57aac 100644 --- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java +++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ChaosContainer.java @@ -84,18 +84,6 @@ public void tailContainerLog() { }); } - public String getContainerLog() { - - LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(this.getContainerId()); - logContainerCmd.withStdOut(true).withStdErr(true); - try { - logContainerCmd.exec(new LogContainerResultCb()).awaitCompletion(); - } catch (InterruptedException e) { - - } - return ""; - } - public ExecResult execCmd(String... cmd) throws Exception { String cmdString = StringUtils.join(cmd, " ");