incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/5] git commit: Fixed hadoop1 hadoop2 issue.
Date Mon, 22 Jun 2015 13:15:35 GMT
Fixed hadoop1 hadoop2 issue.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/d4afbbf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/d4afbbf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/d4afbbf7

Branch: refs/heads/blur-0.2.4-parcel
Commit: d4afbbf745b1c193dc431bf332ef74734a407cfc
Parents: 3b5f8ce
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Jun 18 15:19:54 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Jun 18 15:19:54 2015 -0400

----------------------------------------------------------------------
 .../clusterstatus/ZookeeperClusterStatus.java   | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d4afbbf7/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
index 388a490..72967a0 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
@@ -635,18 +635,23 @@ public class ZookeeperClusterStatus extends ClusterStatus {
 
     String permission = getProperty(tableProperties, BlurConstants.BLUR_BULK_UPDATE_WORKING_PATH_PERMISSION);
     FsPermission fsPermission;
+    // Kinda junky coding, but Hadoop1 prevents me from using a better method.  @TODO cleanup
when only supporting hadoop2.
     if (permission == null || permission.isEmpty()) {
-      fsPermission = FsPermission.getDirDefault();
+      fileSystem.mkdirs(mrIncWorkingPath);
+      fileSystem.mkdirs(newData);
+      fileSystem.mkdirs(tmpData);
+      fileSystem.mkdirs(inprogressData);
+      fileSystem.mkdirs(completeData);
+      fileSystem.mkdirs(fileCache);
     } else {
       fsPermission = new FsPermission(permission);
+      fileSystem.mkdirs(mrIncWorkingPath, fsPermission);
+      fileSystem.mkdirs(newData, fsPermission);
+      fileSystem.mkdirs(tmpData, fsPermission);
+      fileSystem.mkdirs(inprogressData, fsPermission);
+      fileSystem.mkdirs(completeData, fsPermission);
+      fileSystem.mkdirs(fileCache, fsPermission);
     }
-
-    fileSystem.mkdirs(mrIncWorkingPath, fsPermission);
-    fileSystem.mkdirs(newData, fsPermission);
-    fileSystem.mkdirs(tmpData, fsPermission);
-    fileSystem.mkdirs(inprogressData, fsPermission);
-    fileSystem.mkdirs(completeData, fsPermission);
-    fileSystem.mkdirs(fileCache, fsPermission);
   }
 
   private String getProperty(Map<String, String> tableProperties, String name) {


Mime
View raw message