[15/17] storm git commit: removed a merge issue multiple permission setting

[bo...@apache.org]

removed a merge issue multiple permission setting


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

Branch: refs/heads/master
Commit: 51058027a3d77145adef244c4cf66b5241fd1252
Parents: 6687bed
Author: Sanket <sc...@untilservice-lm>
Authored: Tue Dec 1 15:15:36 2015 -0600
Committer: Sanket <sc...@untilservice-lm>
Committed: Tue Dec 1 15:15:36 2015 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java  | 2 +-
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/51058027/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
index c344bcf..fbc277e 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
@@ -65,7 +65,7 @@ import static backtype.storm.blobstore.BlobStoreAclHandler.WRITE;
  * 1. The USER interacts with nimbus to upload and access blobs through NimbusBlobStore Client API. Here, unlike
  * local blob store which stores the blobs locally, the nimbus talks to HDFS to upload the blobs.
  * 2. The USER sets the ACLs, and the blob access is validated against these ACLs.
- * 3. The SUPERVISOR interacts with nimbus thorugh HdfsClientBlobStore to download the blobs. Here, unlike local
+ * 3. The SUPERVISOR interacts with nimbus through HdfsClientBlobStore to download the blobs. Here, unlike local
  * blob store the supervisor interacts with HDFS directly to download the blobs. The call to HdfsBlobStore is made as a "null"
  * subject. The blobstore gets the hadoop user and validates permissions for the supervisor.
  */

http://git-wip-us.apache.org/repos/asf/storm/blob/51058027/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index e066269..d85893b 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -869,8 +869,7 @@
         localresources (blobstore-map-to-localresources blobstore-map)]
     (when localresources
       (when-not (.exists user-dir)
-        (FileUtils/forceMkdir user-dir)
-        (setup-blob-permission conf storm-conf (.toString user-dir)))
+        (FileUtils/forceMkdir user-dir))
       (try
         (let [localized-resources (.getBlobs localizer localresources user topo-name user-dir)]
           (setup-blob-permission conf storm-conf (.toString user-dir))