big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-1387. ConcurrentModificationException in TestMiniChaosOzoneCluster. Contributed by Marton Elek. (#732)

Browse Source
This commit is contained in:
Elek, Márton 2019-04-13 00:19:50 +02:00 committed by Arpit Agarwal
parent 62f4808617
commit 5379d85d8e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
View File

@ -136,11 +136,13 @@ void stopChaos() throws Exception {
} }
public void shutdown() { public void shutdown() {
super.shutdown();
try { try {
stopChaos(); stopChaos();
executorService.shutdown(); executorService.shutdown();
executorService.awaitTermination(1, TimeUnit.DAYS); 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) { } catch (Exception e) {
LOG.error("failed to shutdown MiniOzoneChaosCluster", e); LOG.error("failed to shutdown MiniOzoneChaosCluster", e);
} }