This is an automated email from the ASF dual-hosted git repository.
arp pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5379d85 HDDS-1387. ConcurrentModificationException in
TestMiniChaosOzoneCluster. Contributed by Marton Elek. (#732)
5379d85 is described below
commit 5379d85d8ed09b35e293239d3a7f96f8f98c411c
Author: Elek, Márton <e...@users.noreply.github.com>
AuthorDate: Sat Apr 13 00:19:50 2019 +0200
HDDS-1387. ConcurrentModificationException in TestMiniChaosOzoneCluster.
Contributed by Marton Elek. (#732)
---
.../src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 8bef479..059af5a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -136,11 +136,13 @@ public class MiniOzoneChaosCluster extends
MiniOzoneClusterImpl {
}
public void shutdown() {
- super.shutdown();
try {
stopChaos();
executorService.shutdown();
executorService.awaitTermination(1, TimeUnit.DAYS);
+ //this should be called after stopChaos to be sure that the
+ //datanode collection is not modified during the shutdown
+ super.shutdown();
} catch (Exception e) {
LOG.error("failed to shutdown MiniOzoneChaosCluster", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
