You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/11/08 12:29:13 UTC
[ozone] branch master updated: HDDS-5943. Shutdown
ResultHandlerExecutorService for StorageVolumeChecker. (#2806)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ac86851 HDDS-5943. Shutdown ResultHandlerExecutorService for StorageVolumeChecker. (#2806)
ac86851 is described below
commit ac86851fc97e344cac7f4c33ced94fb27cc42231
Author: Gui Hecheng <ma...@tencent.com>
AuthorDate: Mon Nov 8 20:28:48 2021 +0800
HDDS-5943. Shutdown ResultHandlerExecutorService for StorageVolumeChecker. (#2806)
---
.../hadoop/ozone/container/common/volume/StorageVolumeChecker.java | 1 +
.../ozone/container/common/volume/TestStorageVolumeChecker.java | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java
index 2f3871d..fe61a10 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java
@@ -381,6 +381,7 @@ public class StorageVolumeChecker {
public void shutdownAndWait(int gracePeriod, TimeUnit timeUnit) {
periodicDiskChecker.cancel(true);
diskCheckerservice.shutdownNow();
+ checkVolumeResultHandlerExecutorService.shutdownNow();
try {
delegateChecker.shutdownAndWait(gracePeriod, timeUnit);
} catch (InterruptedException e) {
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeChecker.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeChecker.java
index 3708235..55b4c39 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeChecker.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeChecker.java
@@ -175,6 +175,8 @@ public class TestStorageVolumeChecker {
if (result) {
assertThat(numCallbackInvocations.get(), is(1L));
}
+
+ checker.shutdownAndWait(0, TimeUnit.SECONDS);
}
/**
@@ -207,6 +209,8 @@ public class TestStorageVolumeChecker {
for (HddsVolume volume : volumes) {
verify(volume, times(1)).check(anyObject());
}
+
+ checker.shutdownAndWait(0, TimeUnit.SECONDS);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org