From d2636d1a64e207861a9f22be4cf2cdba79845ade Mon Sep 17 00:00:00 2001
From: Bingkun Guo <guobingkun@users.noreply.github.com>
Date: Fri, 1 Jul 2016 09:18:57 -0700
Subject: [PATCH] [pull-deps] If --clean flag is not set, skip creating root
 extension directories if they already exist. (#3130)

---
 .../java/io/druid/cli/PullDependencies.java   |  4 +++
 .../io/druid/cli/PullDependenciesTest.java    | 27 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/io/druid/cli/PullDependencies.java
index e8c69c42146..08159f48108 100644
--- a/services/src/main/java/io/druid/cli/PullDependencies.java
+++ b/services/src/main/java/io/druid/cli/PullDependencies.java
@@ -461,6 +461,10 @@ public class PullDependencies implements Runnable
 
   private void createRootExtensionsDirectory(File atLocation)
   {
+    if (atLocation.isDirectory()) {
+      log.info("Root extension directory [%s] already exists, skip creating");
+      return;
+    }
     if (!atLocation.mkdirs()) {
       throw new ISE(
           String.format(
diff --git a/services/src/test/java/io/druid/cli/PullDependenciesTest.java b/services/src/test/java/io/druid/cli/PullDependenciesTest.java
index 891fca4d1b6..936d8c9c6f8 100644
--- a/services/src/test/java/io/druid/cli/PullDependenciesTest.java
+++ b/services/src/test/java/io/druid/cli/PullDependenciesTest.java
@@ -157,9 +157,9 @@ public class PullDependenciesTest
   }
 
   /**
-   * If --clean is not specified and something already exists at druid.extensions.directory, ISE should be thrown
+   * If --clean is not specified and root extension directory already exists, skip creating.
    */
-  @Test(expected = ISE.class)
+  @Test()
   public void testPullDependencies_root_extension_dir_exists()
   {
     rootExtensionsDir.mkdir();
@@ -167,16 +167,35 @@ public class PullDependenciesTest
   }
 
   /**
-   * If --clean is not specified and something already exists at druid.extensions.hadoopDependenciesDir,
-   * ISE should be thrown
+   * A file exists on the root extension directory path, but it's not a directory, throw ISE.
    */
   @Test(expected = ISE.class)
+  public void testPullDependencies_root_extension_dir_bad_state() throws IOException
+  {
+    Assert.assertTrue(rootExtensionsDir.createNewFile());
+    pullDependencies.run();
+  }
+
+  /**
+   * If --clean is not specified and hadoop dependencies directory already exists, skip creating.
+   */
+  @Test()
   public void testPullDependencies_root_hadoop_dependencies_dir_exists()
   {
     rootHadoopDependenciesDir.mkdir();
     pullDependencies.run();
   }
 
+  /**
+   * A file exists on the root hadoop dependencies directory path, but it's not a directory, throw ISE.
+   */
+  @Test(expected = ISE.class)
+  public void testPullDependencies_root_hadoop_dependencies_dir_bad_state() throws IOException
+  {
+    Assert.assertTrue(rootHadoopDependenciesDir.createNewFile());
+    pullDependencies.run();
+  }
+
   @Test
   public void testPullDependencies()
   {