From 3a2f5d6329e80884b795899f0c42c0d61d729e15 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@apache.org>
Date: Tue, 24 Nov 2015 23:47:10 +0000
Subject: [PATCH] YARN-4365. FileSystemNodeLabelStore should check for root dir
 existence on startup. Contributed by Kuhu Shukla (cherry picked from commit
 f5acf94ecafb301a0cc8e8f91f19c8bcbc8da701)

---
 hadoop-yarn-project/CHANGES.txt               |  6 ++++
 .../nodelabels/FileSystemNodeLabelsStore.java |  6 ++--
 .../TestFileSystemNodeLabelsStore.java        | 29 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fee03c50596..fe1d3f0e2a0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1048,6 +1048,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4344. NMs reconnecting with changed capabilities can lead to wrong
     cluster resource calculations (Varun Vasudev via jlowe)
 
+    YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
+    startup (Kuhu Shukla via jlowe)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -1914,6 +1917,9 @@ Release 2.6.3 - UNRELEASED
     YARN-3925. ContainerLogsUtils#getContainerLogFile fails to read container
     log files from full disks. (zhihai xu via jlowe)
 
+    YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
+    startup (Kuhu Shukla via jlowe)
+
 Release 2.6.2 - 2015-10-28
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
index 20dc67c10e4..c9727a2ea7c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
@@ -88,7 +88,9 @@ public class FileSystemNodeLabelsStore extends NodeLabelsStore {
     setFileSystem(conf);
 
     // mkdir of root dir path
-    fs.mkdirs(fsWorkingPath);
+    if (!fs.exists(fsWorkingPath)) {
+      fs.mkdirs(fsWorkingPath);
+    }
   }
 
   @Override
@@ -96,7 +98,7 @@ public class FileSystemNodeLabelsStore extends NodeLabelsStore {
     IOUtils.cleanup(LOG, fs, editlogOs);
   }
 
-  private void setFileSystem(Configuration conf) throws IOException {
+  void setFileSystem(Configuration conf) throws IOException {
     Configuration confCopy = new Configuration(conf);
     confCopy.setBoolean("dfs.client.retry.policy.enabled", true);
     String retryPolicy =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
index 4b052c9c8ee..4929f955988 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
@@ -24,6 +24,8 @@ import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.yarn.api.records.NodeLabel;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.event.InlineDispatcher;
@@ -33,6 +35,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
+import org.mockito.Mockito;
 
 public class TestFileSystemNodeLabelsStore extends NodeLabelTestBase {
   MockNodeLabelManager mgr = null;
@@ -317,4 +320,30 @@ public class TestFileSystemNodeLabelsStore extends NodeLabelTestBase {
         Arrays.asList("p2", "p4", "p6", "p7", "p8", "p9")));
     mgr.stop();
   }
+
+  @Test
+  public void testRootMkdirOnInitStore() throws Exception {
+    final FileSystem mockFs = Mockito.mock(FileSystem.class);
+    FileSystemNodeLabelsStore mockStore = new FileSystemNodeLabelsStore(mgr) {
+      void setFileSystem(Configuration conf) throws IOException {
+        fs = mockFs;
+      }
+    };
+    mockStore.fs = mockFs;
+    verifyMkdirsCount(mockStore, true, 0);
+    verifyMkdirsCount(mockStore, false, 1);
+    verifyMkdirsCount(mockStore, true, 1);
+    verifyMkdirsCount(mockStore, false, 2);
+  }
+
+  private void verifyMkdirsCount(FileSystemNodeLabelsStore store,
+                                 boolean existsRetVal, int expectedNumOfCalls)
+      throws Exception {
+    Mockito.when(store.fs.exists(Mockito.any(
+        Path.class))).thenReturn(existsRetVal);
+    store.init(conf);
+    Mockito.verify(store.fs,Mockito.times(
+        expectedNumOfCalls)).mkdirs(Mockito.any(Path
+        .class));
+  }
 }