replace deprecated API TachyonFS usage with TachyonFileSystem

Alluxio · Sep 18, 2015 · 1c45bfb · 1c45bfb
1 parent 8b309a2
commit 1c45bfb
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 40 deletions.
diff --git a/servers/src/main/java/tachyon/web/WebInterfaceBrowseServlet.java b/servers/src/main/java/tachyon/web/WebInterfaceBrowseServlet.java
@@ -32,10 +32,11 @@
 
 import tachyon.Constants;
 import tachyon.TachyonURI;
-import tachyon.client.ReadType;
+import tachyon.client.ClientOptions;
-import tachyon.client.TachyonFS;
+import tachyon.client.TachyonStorageType;
-import tachyon.client.TachyonFile;
 import tachyon.client.file.FileInStream;
+import tachyon.client.file.TachyonFile;
+import tachyon.client.file.TachyonFileSystem;
 import tachyon.conf.TachyonConf;
 import tachyon.master.TachyonMaster;
 import tachyon.thrift.BlockLocation;
@@ -75,19 +76,19 @@ public WebInterfaceBrowseServlet(TachyonMaster master) {
    */
   private void displayFile(TachyonURI path, HttpServletRequest request, long offset)
       throws FileDoesNotExistException, InvalidPathException, IOException {
-    String masterAddress =
+    TachyonFileSystem tFS = TachyonFileSystem.get();
-        Constants.HEADER + mMaster.getMasterAddress().getHostName() + ":"
+    TachyonFile tFile = tFS.open(path);
-            + mMaster.getMasterAddress().getPort();
-    TachyonFS tachyonClient = TachyonFS.get(new TachyonURI(masterAddress), new TachyonConf());
-    TachyonFile tFile = tachyonClient.getFile(path);
     String fileData = null;
     if (tFile == null) {
       throw new FileDoesNotExistException(path.toString());
     }
-    if (tFile.isComplete()) {
+    FileInfo fileInfo = tFS.getInfo(tFile);
-      FileInStream is = tFile.getInStream(ReadType.NO_CACHE);
+    if (fileInfo.isComplete) {
+      ClientOptions readNoCache = new ClientOptions.Builder(mTachyonConf)
+          .setTachyonStoreType(TachyonStorageType.NO_STORE).build();
+      FileInStream is = tFS.getInStream(tFile, readNoCache);
       try {
-        int len = (int) Math.min(5 * Constants.KB, tFile.length() - offset);
+        int len = (int) Math.min(5 * Constants.KB, fileInfo.length - offset);
         byte[] data = new byte[len];
         long skipped = is.skip(offset);
         if (skipped < 0) {
@@ -112,11 +113,7 @@ private void displayFile(TachyonURI path, HttpServletRequest request, long offse
     } else {
       fileData = "The requested file is not complete yet.";
     }
-    try {
+    tFS.close();
-      tachyonClient.close();
-    } catch (IOException e) {
-      LOG.error(e.getMessage());
-    }
     List<UiBlockInfo> uiBlockInfo = new ArrayList<UiBlockInfo>();
     for (FileBlockInfo fileBlockInfo : mMaster.getFileSystemMaster().getFileBlockInfoList(path)) {
       uiBlockInfo.add(new UiBlockInfo(fileBlockInfo));
@@ -202,8 +199,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       getServletContext().getRequestDispatcher("/browse.jsp").forward(request, response);
       return;
     } catch (IOException ie) {
-      request.setAttribute("invalidPathError", "Error: File " + currentPath + " is not available "
+      request.setAttribute("invalidPathError",
-          + ie.getMessage());
+          "Error: File " + currentPath + " is not available " + ie.getMessage());
       getServletContext().getRequestDispatcher("/browse.jsp").forward(request, response);
       return;
     }
@@ -249,12 +246,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       request.setAttribute("fileInfos", sub);
     } catch (NumberFormatException nfe) {
       request.setAttribute("fatalError",
-              "Error: offset or limit parse error, " + nfe.getLocalizedMessage());
+          "Error: offset or limit parse error, " + nfe.getLocalizedMessage());
       getServletContext().getRequestDispatcher("/browse.jsp").forward(request, response);
       return;
     } catch (IndexOutOfBoundsException iobe) {
       request.setAttribute("fatalError",
-              "Error: offset or offset + limit is out of bound, " + iobe.getLocalizedMessage());
+          "Error: offset or offset + limit is out of bound, " + iobe.getLocalizedMessage());
       getServletContext().getRequestDispatcher("/browse.jsp").forward(request, response);
       return;
     } catch (IllegalArgumentException iae) {

diff --git a/servers/src/main/java/tachyon/web/WebInterfaceWorkerBlockInfoServlet.java b/servers/src/main/java/tachyon/web/WebInterfaceWorkerBlockInfoServlet.java
@@ -15,6 +15,7 @@
 
 package tachyon.web;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,11 +34,14 @@
 import tachyon.StorageLevelAlias;
 import tachyon.TachyonURI;
 import tachyon.client.TachyonFS;
+import tachyon.client.file.TachyonFile;
+import tachyon.client.file.TachyonFileSystem;
 import tachyon.conf.TachyonConf;
 import tachyon.exception.NotFoundException;
 import tachyon.master.block.BlockId;
 import tachyon.thrift.FileDoesNotExistException;
 import tachyon.thrift.FileInfo;
+import tachyon.thrift.InvalidPathException;
 import tachyon.worker.block.BlockDataManager;
 import tachyon.worker.block.BlockStoreMeta;
 import tachyon.worker.block.meta.BlockMeta;
@@ -67,13 +71,12 @@ public WebInterfaceWorkerBlockInfoServlet(BlockDataManager blockDataManager, Tac
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     request.setAttribute("fatalError", "");
-    TachyonFS tachyonClient = TachyonFS.get(mTachyonConf);
+    TachyonFileSystem tFS = TachyonFileSystem.get();
-
     String filePath = request.getParameter("path");
     if (!(filePath == null || filePath.isEmpty())) {
       // Display file block info
       try {
-        UiFileInfo uiFileInfo = getUiFileInfo(tachyonClient, new TachyonURI(filePath));
+        UiFileInfo uiFileInfo = getUiFileInfo(tFS, new TachyonURI(filePath));
         request.setAttribute("fileBlocksOnTier", uiFileInfo.getBlocksOnTier());
         request.setAttribute("blockSizeBytes", uiFileInfo.getBlockSizeBytes());
         request.setAttribute("path", filePath);
@@ -97,7 +100,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             response);
         return;
       } finally {
-        tachyonClient.close();
+        tFS.close();
       }
     }
 
@@ -107,7 +110,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     // URL can not determine offset and limit, let javascript in jsp determine and redirect
     if (request.getParameter("offset") == null && request.getParameter("limit") == null) {
       getServletContext().getRequestDispatcher("/worker/blockInfo.jsp").forward(request, response);
-      tachyonClient.close();
+      tFS.close();
       return;
     }
 
@@ -117,7 +120,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       List<Long> subFileIds = fileIds.subList(offset, offset + limit);
       List<UiFileInfo> uiFileInfos = new ArrayList<UiFileInfo>(subFileIds.size());
       for (long fileId : subFileIds) {
-        uiFileInfos.add(getUiFileInfo(tachyonClient, fileId));
+        uiFileInfos.add(getUiFileInfo(tFS, fileId));
       }
       request.setAttribute("fileInfos", uiFileInfos);
     } catch (FileDoesNotExistException fdne) {
@@ -144,7 +147,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       getServletContext().getRequestDispatcher("/worker/blockInfo.jsp").forward(request, response);
       return;
     } finally {
-      tachyonClient.close();
+      tFS.close();
     }
 
     getServletContext().getRequestDispatcher("/worker/blockInfo.jsp").forward(request, response);
@@ -173,49 +176,58 @@ private List<Long> getSortedFileIds() {
   /***
    * Get the UiFileInfo object based on fileId.
    *
-   * @param tachyonClient the TachyonFS client.
+   * @param tachyonFileSystem the TachyonFileSystem client.
    * @param fileId the file id of the file.
    * @return the UiFileInfo object of the file.
    * @throws FileDoesNotExistException
    * @throws IOException
    */
-  private UiFileInfo getUiFileInfo(TachyonFS tachyonClient, long fileId)
+  private UiFileInfo getUiFileInfo(TachyonFileSystem tachyonFileSystem, long fileId)
       throws FileDoesNotExistException, NotFoundException, IOException {
-    return getUiFileInfo(tachyonClient, fileId, TachyonURI.EMPTY_URI);
+    return getUiFileInfo(tachyonFileSystem, fileId, TachyonURI.EMPTY_URI);
   }
 
   /***
    * Get the UiFileInfo object based on filePath.
    *
-   * @param tachyonClient the TachyonFS client.
+   * @param tachyonFileSystem the TachyonFileSystem client.
    * @param filePath the path of the file.
    * @return the UiFileInfo object of the file.
    * @throws FileDoesNotExistException
    * @throws IOException
    */
-  private UiFileInfo getUiFileInfo(TachyonFS tachyonClient, TachyonURI filePath)
+  private UiFileInfo getUiFileInfo(TachyonFileSystem tachyonFileSystem, TachyonURI filePath)
-      throws FileDoesNotExistException, NotFoundException, IOException {
+      throws FileDoesNotExistException, NotFoundException, IOException{
-    return getUiFileInfo(tachyonClient, -1, filePath);
+    return getUiFileInfo(tachyonFileSystem, -1, filePath);
   }
 
   /**
    * Gets the UiFileInfo object that represents the fileId, or the filePath if fileId is -1.
    *
-   * @param tachyonClient the TachyonFS client.
+   * @param tachyonFileSystem the TachyonFileSystem client.
    * @param fileId the file id of the file.
    * @param filePath the path of the file. valid iff fileId is -1.
    * @return the UiFileInfo object of the file.
    * @throws FileDoesNotExistException
    * @throws IOException
    */
-  private UiFileInfo getUiFileInfo(TachyonFS tachyonClient, long fileId, TachyonURI filePath)
+  private UiFileInfo getUiFileInfo(TachyonFileSystem tachyonFileSystem, long fileId, TachyonURI filePath)
-      throws FileDoesNotExistException, NotFoundException, IOException {
+          throws FileDoesNotExistException, NotFoundException, IOException {
-    FileInfo fileInfo = tachyonClient.getFileStatus(fileId, filePath, true);
+    TachyonFile file = null;
+    if(fileId == -1){
+      file = new TachyonFile(fileId);
+    } else {
+      try {
+        file = tachyonFileSystem.open(filePath);
+      } catch (InvalidPathException e) {
+        throw new FileDoesNotExistException(filePath.toString());
+      }
+    }
+    FileInfo fileInfo = tachyonFileSystem.getInfo(file);
     if (fileInfo == null) {
       throw new FileDoesNotExistException(fileId != -1 ? Long.toString(fileId)
           : filePath.toString());
     }
-
     UiFileInfo uiFileInfo = new UiFileInfo(fileInfo);
     boolean blockExistOnWorker = false;
     for (long blockId : fileInfo.getBlockIds()) {
@@ -224,7 +236,7 @@ private UiFileInfo getUiFileInfo(TachyonFS tachyonClient, long fileId, TachyonUR
         BlockMeta blockMeta = mBlockDataManager.getVolatileBlockMeta(blockId);
         long blockSize = blockMeta.getBlockSize();
         StorageLevelAlias storageLevelAlias =
-            StorageDirId.getStorageLevelAlias(blockMeta.getParentDir().getStorageDirId());
+                StorageDirId.getStorageLevelAlias(blockMeta.getParentDir().getStorageDirId());
         // The block last access time is not available. Use -1 for now.
         // It's not necessary to show location information here since
         // we are viewing at the context of this worker.