FALCON-2056 HiveDR doesn't work with multiple users

Author: Sowmya Ramesh <sramesh@hortonworks.com> Reviewers: "Peeyush B <peeyushb@apache.org>, Balu Vellanki <balu@apache.org>, Ying Zheng <yzheng@hortonworks.com>" Closes #207 from sowmyaramesh/FALCON-2056
apache · Jul 1, 2016 · 9018ed3 · 9018ed3
1 parent 57fa2ff
commit 9018ed3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/addons/hivedr/src/main/java/org/apache/falcon/hive/LastReplicatedEvents.java b/addons/hivedr/src/main/java/org/apache/falcon/hive/LastReplicatedEvents.java
@@ -71,8 +71,8 @@ private void init(final String jobName) throws Exception {
         FileUtils.validatePath(jobFS, new Path(DRStatusStore.BASE_DEFAULT_STORE_PATH));
 
         if (!jobFS.exists(dir)) {
-            if (!jobFS.mkdirs(dir)) {
-                throw new Exception("Creating directory failed: " + dir);
+            if (!FileSystem.mkdirs(jobFS, dir, FileUtils.DEFAULT_DIR_PERMISSION)) {
+                throw new IOException("Creating directory failed: " + dir);
             }
         }
 

diff --git a/addons/hivedr/src/main/java/org/apache/falcon/hive/util/EventSourcerUtils.java b/addons/hivedr/src/main/java/org/apache/falcon/hive/util/EventSourcerUtils.java
@@ -63,8 +63,8 @@ private void init(final String jobName) throws Exception {
         FileUtils.validatePath(jobFS, new Path(DRStatusStore.BASE_DEFAULT_STORE_PATH));
 
         if (!jobFS.exists(dir)) {
-            if (!jobFS.mkdirs(dir)) {
-                throw new Exception("Creating directory failed: " + dir);
+            if (!FileSystem.mkdirs(jobFS, dir, FileUtils.DEFAULT_DIR_PERMISSION)) {
+                throw new IOException("Creating directory failed: " + dir);
             }
         }
 

diff --git a/addons/hivedr/src/main/java/org/apache/falcon/hive/util/FileUtils.java b/addons/hivedr/src/main/java/org/apache/falcon/hive/util/FileUtils.java
@@ -34,8 +34,10 @@
 public final class FileUtils {
 
     public static final String DEFAULT_EVENT_STORE_PATH = StringUtils.removeEnd(DRStatusStore
-            .BASE_DEFAULT_STORE_PATH,  File.separator) + File.separator + "Events";
+            .BASE_DEFAULT_STORE_PATH,  File.separator) + File.separator + "Events" + File.separator;
     public static final FsPermission FS_PERMISSION_700 = new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE);
+    public static final FsPermission DEFAULT_DIR_PERMISSION =
+            new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.NONE);
 
 
     private FileUtils() {}

diff --git a/addons/hivedr/src/main/java/org/apache/falcon/hive/util/HiveDRStatusStore.java b/addons/hivedr/src/main/java/org/apache/falcon/hive/util/HiveDRStatusStore.java
@@ -49,7 +49,10 @@ public class HiveDRStatusStore extends DRStatusStore {
     private static final Logger LOG = LoggerFactory.getLogger(DRStatusStore.class);
     private FileSystem fileSystem;
 
-    private static final String DEFAULT_STORE_PATH = BASE_DEFAULT_STORE_PATH + "hiveReplicationStatusStore/";
+    private static final String DEFAULT_STORE_PATH = StringUtils.removeEnd
+            (DRStatusStore.BASE_DEFAULT_STORE_PATH,  File.separator) + File.separator
+            + "hiveReplicationStatusStore" + File.separator;
+
     private static final FsPermission DEFAULT_STATUS_DIR_PERMISSION =
             new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.NONE);
 

diff --git a/...ons/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java b/...ons/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java
@@ -217,7 +217,7 @@ public Properties getAdditionalProperties(final Properties extensionProperties)
         String replicationMaxMaps =
                 extensionProperties.getProperty(HiveMirroringExtensionProperties.MAX_MAPS.getName());
         if (StringUtils.isBlank(replicationMaxMaps)) {
-            additionalProperties.put(HiveMirroringExtensionProperties.MAX_MAPS.getName(), "5");
+            additionalProperties.put(HiveMirroringExtensionProperties.MAX_MAPS.getName(), "2");
         }
 
         String distcpMaxMaps = extensionProperties.getProperty(