You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ba...@apache.org on 2016/07/01 17:45:33 UTC
falcon git commit: FALCON-2056 HiveDR doesn't work with multiple users
Repository: falcon
Updated Branches:
refs/heads/master 57fa2ff12 -> 9018ed345
FALCON-2056 HiveDR doesn't work with multiple users
Author: Sowmya Ramesh <sr...@hortonworks.com>
Reviewers: "Peeyush B <pe...@apache.org>, Balu Vellanki <ba...@apache.org>, Ying Zheng <yz...@hortonworks.com>"
Closes #207 from sowmyaramesh/FALCON-2056
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/9018ed34
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/9018ed34
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/9018ed34
Branch: refs/heads/master
Commit: 9018ed3458d4d1def5c0643fa0e45a61fc5d82f7
Parents: 57fa2ff
Author: Sowmya Ramesh <sr...@hortonworks.com>
Authored: Fri Jul 1 10:45:28 2016 -0700
Committer: bvellanki <bv...@hortonworks.com>
Committed: Fri Jul 1 10:45:28 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/falcon/hive/LastReplicatedEvents.java | 4 ++--
.../java/org/apache/falcon/hive/util/EventSourcerUtils.java | 4 ++--
.../src/main/java/org/apache/falcon/hive/util/FileUtils.java | 4 +++-
.../java/org/apache/falcon/hive/util/HiveDRStatusStore.java | 5 ++++-
.../extensions/mirroring/hive/HiveMirroringExtension.java | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/9018ed34/addons/hivedr/src/main/java/org/apache/falcon/hive/LastReplicatedEvents.java
----------------------------------------------------------------------
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
index bae6c9e..a603deb 100644
--- 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 @@ public class LastReplicatedEvents {
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);
}
}
http://git-wip-us.apache.org/repos/asf/falcon/blob/9018ed34/addons/hivedr/src/main/java/org/apache/falcon/hive/util/EventSourcerUtils.java
----------------------------------------------------------------------
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
index fb695d0..3d3badf 100644
--- 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 @@ public class EventSourcerUtils {
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);
}
}
http://git-wip-us.apache.org/repos/asf/falcon/blob/9018ed34/addons/hivedr/src/main/java/org/apache/falcon/hive/util/FileUtils.java
----------------------------------------------------------------------
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
index ce80586..8b5c865 100644
--- 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 @@ import java.io.IOException;
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() {}
http://git-wip-us.apache.org/repos/asf/falcon/blob/9018ed34/addons/hivedr/src/main/java/org/apache/falcon/hive/util/HiveDRStatusStore.java
----------------------------------------------------------------------
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
index 76eda87..44f0989 100644
--- 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);
http://git-wip-us.apache.org/repos/asf/falcon/blob/9018ed34/extensions/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java
----------------------------------------------------------------------
diff --git a/extensions/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java b/extensions/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java
index 75759df..9222e0a 100644
--- a/extensions/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java
+++ b/extensions/src/main/java/org/apache/falcon/extensions/mirroring/hive/HiveMirroringExtension.java
@@ -217,7 +217,7 @@ public class HiveMirroringExtension extends AbstractExtension {
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(