commit ba8c6e130e524fc1454b279ab329b03a9877b13e
author Maja Kabiljo <majakabiljo@fb.com> Thu Mar 30 13:23:00 2017 -0700
committer Maja Kabiljo <majakabiljo@fb.com> Thu Mar 30 13:23:00 2017 -0700
tree 01c235e84878e2bcf691e03e2ace7d3c57367542
parent 824b34cac1d05917eb2bc3dc8c62c9772d0c6e4d

JIRA-1138

closes #27

giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java

diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
index ca7226f..ac787cc 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
@@ -260,6 +260,9 @@
     context
         .setStatus("setup: Connected to Zookeeper service " + serverPortList);
     this.graphFunctions = determineGraphFunctions(conf, zkManager);
+    if (this.graphFunctions.isMaster()) {
+      zkManager.cleanupOnExit();
+    }
     try {
       instantiateBspService();
     } catch (IOException e) {

giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java

diff --git a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
index b843882..c398140 100644
--- a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
+++ b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
@@ -725,6 +725,18 @@
   }
 
   /**
+   * Mark files zookeeper creates in hdfs to be deleted on exit.
+   * To be called on master, since it's the last one who finishes.
+   */
+  public void cleanupOnExit() {
+    try {
+      fs.deleteOnExit(baseDirectory);
+    } catch (IOException e) {
+      LOG.error("cleanupOnExit: Failed to delete on exit " + baseDirectory);
+    }
+  }
+
+  /**
    * Do necessary cleanup in zookeeper wrapper.
    */
   public void cleanup() {