Repository: flink Updated Branches: refs/heads/master 7378f014b -> f8f747f22
[FLINK-3268] [tests] Enhance stability of ZooKeeperTestEnvironment.deleteAll() Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f8f747f2 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f8f747f2 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f8f747f2 Branch: refs/heads/master Commit: f8f747f2290ad623bd8a4f0d8ff4708fada6792a Parents: 7378f01 Author: Stephan Ewen <se...@apache.org> Authored: Wed Feb 3 22:13:25 2016 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Thu Feb 4 15:49:15 2016 +0100 ---------------------------------------------------------------------- .../runtime/zookeeper/ZooKeeperTestEnvironment.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f8f747f2/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java index 94e1988..5aca687 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java @@ -137,7 +137,19 @@ public class ZooKeeperTestEnvironment { */ public void deleteAll() throws Exception { final String path = "/" + client.getNamespace(); - ZKPaths.deleteChildren(client.getZookeeperClient().getZooKeeper(), path, false); + + for (int attempt = 0; attempt < 3; attempt++) { + try { + ZKPaths.deleteChildren(client.getZookeeperClient().getZooKeeper(), path, false); + break; + } + catch (org.apache.zookeeper.KeeperException.NoNodeException e) { + // that seems all right. if one of the children we want to delete is + // actually already deleted, that's fine. + + // still, fall through the loop to delete the other children + } + } } }
