Merge pull request Alluxio#581 from jxfeng/up

configuration fix : conf pass down
WangTaoTheTonic · Dec 27, 2014 · a26ee0d · a26ee0d
2 parents 12dfb49 + f51c355
commit a26ee0d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/core/src/main/java/tachyon/client/BlockInStream.java b/core/src/main/java/tachyon/client/BlockInStream.java
@@ -35,7 +35,7 @@ public abstract class BlockInStream extends InStream {
    */
   public static BlockInStream get(TachyonFile tachyonFile, ReadType readType, int blockIndex)
       throws IOException {
-    return get(tachyonFile, readType, blockIndex, null);
+    return get(tachyonFile, readType, blockIndex, tachyonFile.getUFSConf());
   }
 
   /**

diff --git a/core/src/main/java/tachyon/client/FileOutStream.java b/core/src/main/java/tachyon/client/FileOutStream.java
@@ -68,7 +68,8 @@ public class FileOutStream extends OutStream {
     mCachedBytes = 0;
 
     if (mWriteType.isThrough()) {
-      mUnderFsFile = CommonUtils.concat(mTachyonFS.createAndGetUserUfsTempFolder(), mFile.mFileId);
+      mUnderFsFile = CommonUtils.concat(mTachyonFS.createAndGetUserUfsTempFolder(ufsConf), 
+            mFile.mFileId);
       UnderFileSystem underfsClient = UnderFileSystem.get(mUnderFsFile, ufsConf);
       if (mBlockCapacityByte > Integer.MAX_VALUE) {
         throw new IOException("BLOCK_CAPCAITY (" + mBlockCapacityByte + ") can not bigger than "

diff --git a/core/src/main/java/tachyon/client/TachyonFS.java b/core/src/main/java/tachyon/client/TachyonFS.java
@@ -257,18 +257,18 @@ synchronized File createAndGetUserLocalTempFolder() throws IOException {
 
   /**
    * Create a user UnderFileSystem temporary folder and return it
-   * 
+   * @param ufsConf the configuration of UnderFileSystem
    * @return the UnderFileSystem temporary folder
    * @throws IOException
    */
-  synchronized String createAndGetUserUfsTempFolder() throws IOException {
+  synchronized String createAndGetUserUfsTempFolder(Object ufsConf) throws IOException {
     String tmpFolder = mWorkerClient.getUserUfsTempFolder();
     if (tmpFolder == null) {
       return null;
     }
 
     if (mUnderFileSystem == null) {
-      mUnderFileSystem = UnderFileSystem.get(tmpFolder);
+      mUnderFileSystem = UnderFileSystem.get(tmpFolder, ufsConf);
     }
 
     mUnderFileSystem.mkdirs(tmpFolder, true);