Addressed review comments.

Alluxio · Sep 28, 2015 · e4af88c · e4af88c
1 parent 725ca41
commit e4af88c
Show file tree

Hide file tree

Showing 35 changed files with 406 additions and 289 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/file/FileOutStream.java b/clients/unshaded/src/main/java/tachyon/client/file/FileOutStream.java
@@ -122,11 +122,11 @@ public void close() throws IOException {
 
     Boolean canComplete = false;
     if (mUnderStorageType.isPersist()) {
+      FileInfo fileInfo = getFileInfo(mFileId);
+      String ufsPath = fileInfo.getUfsPath();
       if (mCanceled) {
         // TODO(yupeng): Handle this special case in under storage integrations.
         mUnderStorageOutputStream.close();
-        FileInfo fileInfo = getFileInfo(mFileId);
-        String ufsPath = fileInfo.getUfsPath();
         String fileName = PathUtils.temporaryFileName(mFileId, mNonce, ufsPath);
         UnderFileSystem underFsClient = UnderFileSystem.get(fileName, ClientContext.getConf());
         underFsClient.delete(fileName, false);
@@ -136,7 +136,7 @@ public void close() throws IOException {
         WorkerClient workerClient = BlockStoreContext.INSTANCE.acquireWorkerClient();
         try {
           // TODO(yupeng): Investigate if this RPC can be moved to master.
-          workerClient.addCheckpoint(mFileId, mNonce);
+          workerClient.persistFile(mFileId, mNonce, ufsPath);
         } finally {
           BlockStoreContext.INSTANCE.releaseWorkerClient(workerClient);
         }

diff --git a/common/src/main/java/tachyon/thrift/BlockInfo.java b/common/src/main/java/tachyon/thrift/BlockInfo.java
diff --git a/common/src/main/java/tachyon/thrift/BlockInfoException.java b/common/src/main/java/tachyon/thrift/BlockInfoException.java
diff --git a/common/src/main/java/tachyon/thrift/BlockLocation.java b/common/src/main/java/tachyon/thrift/BlockLocation.java
diff --git a/common/src/main/java/tachyon/thrift/BlockMasterService.java b/common/src/main/java/tachyon/thrift/BlockMasterService.java
diff --git a/common/src/main/java/tachyon/thrift/Command.java b/common/src/main/java/tachyon/thrift/Command.java
diff --git a/common/src/main/java/tachyon/thrift/DependencyDoesNotExistException.java b/common/src/main/java/tachyon/thrift/DependencyDoesNotExistException.java
diff --git a/common/src/main/java/tachyon/thrift/DependencyInfo.java b/common/src/main/java/tachyon/thrift/DependencyInfo.java
diff --git a/common/src/main/java/tachyon/thrift/FailedToCheckpointException.java b/common/src/main/java/tachyon/thrift/FailedToCheckpointException.java
diff --git a/common/src/main/java/tachyon/thrift/FileAlreadyExistException.java b/common/src/main/java/tachyon/thrift/FileAlreadyExistException.java
diff --git a/common/src/main/java/tachyon/thrift/FileBlockInfo.java b/common/src/main/java/tachyon/thrift/FileBlockInfo.java
diff --git a/common/src/main/java/tachyon/thrift/FileDoesNotExistException.java b/common/src/main/java/tachyon/thrift/FileDoesNotExistException.java
diff --git a/common/src/main/java/tachyon/thrift/FileInfo.java b/common/src/main/java/tachyon/thrift/FileInfo.java
diff --git a/common/src/main/java/tachyon/thrift/FileSystemMasterService.java b/common/src/main/java/tachyon/thrift/FileSystemMasterService.java
diff --git a/common/src/main/java/tachyon/thrift/InvalidPathException.java b/common/src/main/java/tachyon/thrift/InvalidPathException.java
diff --git a/common/src/main/java/tachyon/thrift/MountOpts.java b/common/src/main/java/tachyon/thrift/MountOpts.java
diff --git a/common/src/main/java/tachyon/thrift/NetAddress.java b/common/src/main/java/tachyon/thrift/NetAddress.java
diff --git a/common/src/main/java/tachyon/thrift/NoWorkerException.java b/common/src/main/java/tachyon/thrift/NoWorkerException.java
diff --git a/common/src/main/java/tachyon/thrift/OutOfSpaceException.java b/common/src/main/java/tachyon/thrift/OutOfSpaceException.java
diff --git a/common/src/main/java/tachyon/thrift/RawTableInfo.java b/common/src/main/java/tachyon/thrift/RawTableInfo.java
diff --git a/common/src/main/java/tachyon/thrift/RawTableMasterService.java b/common/src/main/java/tachyon/thrift/RawTableMasterService.java
diff --git a/common/src/main/java/tachyon/thrift/SuspectedFileSizeException.java b/common/src/main/java/tachyon/thrift/SuspectedFileSizeException.java
diff --git a/common/src/main/java/tachyon/thrift/TableColumnException.java b/common/src/main/java/tachyon/thrift/TableColumnException.java
diff --git a/common/src/main/java/tachyon/thrift/TableDoesNotExistException.java b/common/src/main/java/tachyon/thrift/TableDoesNotExistException.java
diff --git a/common/src/main/java/tachyon/thrift/TachyonException.java b/common/src/main/java/tachyon/thrift/TachyonException.java
diff --git a/common/src/main/java/tachyon/thrift/WorkerInfo.java b/common/src/main/java/tachyon/thrift/WorkerInfo.java