HDDS-15040. Fix inverted ExecutorService#awaitTermination (#10113)

ivandika3 · web-flow · commit bee32d5b52a7 · 2026-04-23T20:50:22.000+02:00
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmTopologyClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/ScmTopologyClient.java
@@ -80,7 +80,7 @@ public void stop() {
     if (executorService != null) {
       executorService.shutdown();
       try {
-        if (executorService.awaitTermination(5, TimeUnit.SECONDS)) {
+        if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) {
           executorService.shutdownNow();
         }
       } catch (InterruptedException e) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/symmetric/DefaultSecretKeySignerClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/symmetric/DefaultSecretKeySignerClient.java
@@ -128,7 +128,7 @@ public void stop() {
     if (executorService != null) {
       executorService.shutdown();
       try {
-        if (executorService.awaitTermination(1, TimeUnit.MINUTES)) {
+        if (!executorService.awaitTermination(1, TimeUnit.MINUTES)) {
           executorService.shutdownNow();
         }
       } catch (InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void stop() {`
`80`	`80`	`if (executorService != null) {`
`81`	`81`	`executorService.shutdown();`
`82`	`82`	`try {`
`83`		`- if (executorService.awaitTermination(5, TimeUnit.SECONDS)) {`
	`83`	`+ if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) {`
`84`	`84`	`executorService.shutdownNow();`
`85`	`85`	`}`
`86`	`86`	`} catch (InterruptedException e) {`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public void stop() {`
`128`	`128`	`if (executorService != null) {`
`129`	`129`	`executorService.shutdown();`
`130`	`130`	`try {`
`131`		`- if (executorService.awaitTermination(1, TimeUnit.MINUTES)) {`
	`131`	`+ if (!executorService.awaitTermination(1, TimeUnit.MINUTES)) {`
`132`	`132`	`executorService.shutdownNow();`
`133`	`133`	`}`
`134`	`134`	`} catch (InterruptedException e) {`