Port WebInterfaceMemoryServlet

Alluxio · Sep 3, 2015 · f9d16a7 · f9d16a7
1 parent ee982a0
commit f9d16a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/servers/src/main/java/tachyon/web/MasterUIWebServer.java b/servers/src/main/java/tachyon/web/MasterUIWebServer.java
@@ -41,8 +41,7 @@ public MasterUIWebServer(ServiceType service, InetSocketAddress address, Tachyon
     mWebAppContext.addServlet(new ServletHolder(
         new WebInterfaceConfigurationServlet(master.getFileSystemMaster())), "/configuration");
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceBrowseServlet(master)), "/browse");
-    mWebAppContext.addServlet(new ServletHolder(new WebInterfaceMemoryServlet(masterInfo)),
+    mWebAppContext.addServlet(new ServletHolder(new WebInterfaceMemoryServlet(master)), "/memory");
-        "/memory");
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceDependencyServlet(masterInfo)),
         "/dependency");
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceDownloadServlet(masterInfo)),

diff --git a/servers/src/main/java/tachyon/web/WebInterfaceMemoryServlet.java b/servers/src/main/java/tachyon/web/WebInterfaceMemoryServlet.java
@@ -28,7 +28,7 @@
 import com.google.common.base.Preconditions;
 
 import tachyon.TachyonURI;
-import tachyon.master.MasterInfo;
+import tachyon.master.TachyonMaster;
 import tachyon.thrift.FileDoesNotExistException;
 import tachyon.thrift.FileInfo;
 import tachyon.thrift.InvalidPathException;
@@ -38,10 +38,10 @@
  */
 public final class WebInterfaceMemoryServlet extends HttpServlet {
   private static final long serialVersionUID = 4293149962399443914L;
-  private final transient MasterInfo mMasterInfo;
+  private final transient TachyonMaster mMaster;
 
-  public WebInterfaceMemoryServlet(MasterInfo masterInfo) {
+  public WebInterfaceMemoryServlet(TachyonMaster master) {
-    mMasterInfo = Preconditions.checkNotNull(masterInfo);
+    mMaster = Preconditions.checkNotNull(master);
   }
 
   /**
@@ -55,16 +55,17 @@ public WebInterfaceMemoryServlet(MasterInfo masterInfo) {
   @Override
   public void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
-    request.setAttribute("masterNodeAddress", mMasterInfo.getMasterAddress().toString());
+    request.setAttribute("masterNodeAddress", mMaster.getMasterAddress().toString());
     request.setAttribute("fatalError", "");
 
-    List<TachyonURI> inMemoryFiles = mMasterInfo.getInMemoryFiles();
+    List<TachyonURI> inMemoryFiles = mMaster.getFileSystemMaster().getInMemoryFiles();
     Collections.sort(inMemoryFiles);
 
     List<UiFileInfo> fileInfos = new ArrayList<UiFileInfo>(inMemoryFiles.size());
     for (TachyonURI file : inMemoryFiles) {
       try {
-        FileInfo fileInfo = mMasterInfo.getFileInfo(file);
+        long fileId = mMaster.getFileSystemMaster().getFileId(file);
+        FileInfo fileInfo = mMaster.getFileSystemMaster().getFileInfo(fileId);
         if (fileInfo != null && fileInfo.getInMemoryPercentage() == 100) {
           fileInfos.add(new UiFileInfo(fileInfo));
         }
@@ -79,7 +80,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
         return;
       }
     }
-    request.setAttribute("inMemoryFileNum", Integer.valueOf(fileInfos.size()));
+    request.setAttribute("inMemoryFileNum", fileInfos.size());
 
     // URL is "./memory", can not determine offset and limit, let javascript in jsp determine
     // and redirect to "./memory?offset=xxx&limit=xxx"