Update TachyonFS to use FSMasterClient.

Alluxio · Aug 27, 2015 · b6b5798 · b6b5798
1 parent d3a798d
commit b6b5798
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/next/file/FSContext.java b/clients/unshaded/src/main/java/tachyon/client/next/file/FSContext.java
@@ -15,6 +15,7 @@
 
 package tachyon.client.next.file;
 
+import tachyon.client.FileSystemMasterClient;
 import tachyon.client.next.ClientContext;
 import tachyon.client.next.block.BlockMasterClientPool;
 import tachyon.client.next.block.TachyonBS;
@@ -28,20 +29,20 @@ public enum FSContext {
   INSTANCE;
 
   // TODO: Separate this when block master and file system master use different clients
-  private final BlockMasterClientPool mFileSystemMasterClientPool;
+  private final FSMasterClientPool mFileSystemMasterClientPool;
   private final TachyonBS mTachyonBS;
 
   private FSContext() {
     mFileSystemMasterClientPool =
-        new BlockMasterClientPool(ClientContext.getMasterAddress(), ClientContext.getConf());
+        new FSMasterClientPool(ClientContext.getMasterAddress(), ClientContext.getConf());
     mTachyonBS = TachyonBS.get();
   }
 
-  public MasterClient acquireMasterClient() {
+  public FileSystemMasterClient acquireMasterClient() {
     return mFileSystemMasterClientPool.acquire();
   }
 
-  public void releaseMasterClient(MasterClient masterClient) {
+  public void releaseMasterClient(FileSystemMasterClient masterClient) {
     mFileSystemMasterClientPool.release(masterClient);
   }
 

diff --git a/clients/unshaded/src/main/java/tachyon/client/next/file/TachyonFS.java b/clients/unshaded/src/main/java/tachyon/client/next/file/TachyonFS.java
@@ -20,8 +20,8 @@
 import java.util.List;
 
 import tachyon.TachyonURI;
+import tachyon.client.FileSystemMasterClient;
 import tachyon.client.next.ClientOptions;
-import tachyon.master.MasterClient;
 import tachyon.thrift.FileInfo;
 
 /**
@@ -63,9 +63,9 @@ public synchronized void close() {
    */
   @Override
   public void delete(TachyonFile file) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
-      masterClient.user_delete(file.getFileId(), "", true);
+      masterClient.deleteFile(file.getFileId(), true);
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -80,9 +80,9 @@ public void delete(TachyonFile file) throws IOException {
    */
   @Override
   public void free(TachyonFile file) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
-      masterClient.user_freepath(file.getFileId(), "", true);
+      masterClient.freePath(file.getFileId(), true);
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -98,9 +98,9 @@ public void free(TachyonFile file) throws IOException {
   // TODO: Consider FileInfo caching
   @Override
   public FileInfo getInfo(TachyonFile file) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
-      return masterClient.getFileStatus(file.getFileId(), "");
+      return masterClient.getFileInfo(file.getFileId());
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -117,10 +117,10 @@ public FileInfo getInfo(TachyonFile file) throws IOException {
    * @throws IOException if the file does not exist or the stream cannot be opened
    */
   public FileInStream getInStream(TachyonFile file, ClientOptions options) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
       // TODO: Make sure the file is not a folder
-      FileInfo info = masterClient.getFileStatus(file.getFileId(), "");
+      FileInfo info = masterClient.getFileInfo(file.getFileId());
       return new ClientFileInStream(info, options);
     } finally {
       mContext.releaseMasterClient(masterClient);
@@ -138,9 +138,10 @@ public FileInStream getInStream(TachyonFile file, ClientOptions options) throws
    * @throws IOException if the file already exists or if the stream cannot be opened
    */
   public FileOutStream getOutStream(TachyonURI path, ClientOptions options) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
-      int fileId = masterClient.user_createFile(path.getPath(), "", options.getBlockSize(), true);
+      // TODO: Fix the RPC arguments
+      int fileId = masterClient.createFile(path.getPath(), options.getBlockSize(), true);
       return new ClientFileOutStream(fileId, options);
     } finally {
       mContext.releaseMasterClient(masterClient);
@@ -157,10 +158,10 @@ public FileOutStream getOutStream(TachyonURI path, ClientOptions options) throws
    */
   @Override
   public List<FileInfo> listStatus(TachyonFile file) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
       // TODO: Change this RPC
-      return masterClient.listStatus(null);
+      return masterClient.getFileInfo(file.getFileId());
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -175,9 +176,10 @@ public List<FileInfo> listStatus(TachyonFile file) throws IOException {
    */
   @Override
   public boolean mkdirs(TachyonURI path) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
-      return masterClient.user_mkdirs(path.getPath(), true);
+      // TODO: Change this RPC's arguments
+      return masterClient.createDirectory(path.getPath(), true);
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -193,10 +195,10 @@ public boolean mkdirs(TachyonURI path) throws IOException {
    */
   @Override
   public TachyonFile open(TachyonURI path) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
       // TODO: Remove path from this RPC
-      return new TachyonFile(masterClient.getFileStatus(-1, path.getPath()).getFileId());
+      return new TachyonFile(masterClient.getFileId(path.getPath()));
     } finally {
       mContext.releaseMasterClient(masterClient);
     }
@@ -212,10 +214,10 @@ public TachyonFile open(TachyonURI path) throws IOException {
    */
   @Override
   public boolean rename(TachyonFile src, TachyonURI dst) throws IOException {
-    MasterClient masterClient = mContext.acquireMasterClient();
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
     try {
       // TODO: Remove path from this RPC
-      return masterClient.user_rename(src.getFileId(), "", dst.getPath());
+      return masterClient.renameFile(src.getFileId(), dst.getPath());
     } finally {
       mContext.releaseMasterClient(masterClient);
     }

diff --git a/common/src/main/java/tachyon/client/FileSystemMasterClient.java b/common/src/main/java/tachyon/client/FileSystemMasterClient.java
@@ -123,7 +123,7 @@ public synchronized String getUfsAddress() throws IOException {
     return null;
   }
 
-  public synchronized long createFile(long fileId, long blockSizeBytes, boolean recursive)
+  public synchronized long createFile(String fileId, long blockSizeBytes, boolean recursive)
       throws IOException {
     return -1;
   }