Port WebInterfaceWorkersServlet

Alluxio · Sep 3, 2015 · f523990 · f523990
1 parent 17e4f02
commit f523990
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/servers/src/main/java/tachyon/web/MasterUIWebServer.java b/servers/src/main/java/tachyon/web/MasterUIWebServer.java
@@ -36,8 +36,8 @@ public MasterUIWebServer(ServiceType service, InetSocketAddress address, Tachyon
     Preconditions.checkNotNull(master, "TachyonMaster cannot be null");
 
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceGeneralServlet(master)), "/home");
-    mWebAppContext.addServlet(new ServletHolder(new WebInterfaceWorkersServlet(masterInfo)),
+    mWebAppContext.addServlet(new ServletHolder(
-        "/workers");
+        new WebInterfaceWorkersServlet(master.getBlockMaster())), "/workers");
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceConfigurationServlet(masterInfo)),
         "/configuration");
     mWebAppContext.addServlet(new ServletHolder(new WebInterfaceBrowseServlet(masterInfo)),

diff --git a/servers/src/main/java/tachyon/web/WebInterfaceWorkersServlet.java b/servers/src/main/java/tachyon/web/WebInterfaceWorkersServlet.java
@@ -28,7 +28,7 @@
 
 import tachyon.Constants;
 import tachyon.conf.TachyonConf;
-import tachyon.master.MasterInfo;
+import tachyon.master.block.BlockMaster;
 import tachyon.thrift.WorkerInfo;
 import tachyon.util.FormatUtils;
 
@@ -97,11 +97,11 @@ public int getUsedSpacePercent() {
 
   private static final long serialVersionUID = -7454493761603179826L;
 
-  private final transient MasterInfo mMasterInfo;
+  private final transient BlockMaster mBlockMaster;
   private final transient TachyonConf mTachyonConf;
 
-  public WebInterfaceWorkersServlet(MasterInfo masterInfo) {
+  public WebInterfaceWorkersServlet(BlockMaster blockMaster) {
-    mMasterInfo = masterInfo;
+    mBlockMaster = blockMaster;
     mTachyonConf = new TachyonConf();
   }
 
@@ -151,11 +151,11 @@ public int compare(WorkerInfo info0, WorkerInfo info1) {
   private void populateValues(HttpServletRequest request) throws IOException {
     request.setAttribute("debug", Constants.DEBUG);
 
-    List<WorkerInfo> workerInfos = mMasterInfo.getWorkerInfoList();
+    List<WorkerInfo> workerInfos = mBlockMaster.getWorkerInfoList();
     NodeInfo[] normalNodeInfos = generateOrderedNodeInfos(workerInfos);
     request.setAttribute("normalNodeInfos", normalNodeInfos);
 
-    List<WorkerInfo> lostWorkerInfos = mMasterInfo.getLostWorkersInfo();
+    List<WorkerInfo> lostWorkerInfos = mBlockMaster.getLostWorkersInfo();
     NodeInfo[] failedNodeInfos = generateOrderedNodeInfos(lostWorkerInfos);
     request.setAttribute("failedNodeInfos", failedNodeInfos);