diff --git a/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java b/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java index ade6731124..e86b6597d4 100644 --- a/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java +++ b/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java @@ -79,8 +79,8 @@ public Response> nodes(@QueryParam("status") String status) { serverList = clusterManager.getLostServerList(); } else if (ServerStatus.EXCLUDED.name().equalsIgnoreCase(status)) { serverList = - clusterManager.getExcludedNodes().stream() - .map(ServerNode::new) + clusterManager.list().stream() + .filter(node -> clusterManager.getExcludedNodes().contains(node.getId())) .collect(Collectors.toList()); } else { List serverAllList = clusterManager.list(); @@ -92,9 +92,10 @@ public Response> nodes(@QueryParam("status") String status) { serverList = serverList.stream() .filter( - server -> { - return status == null || server.getStatus().name().equalsIgnoreCase(status); - }) + server -> + status == null + || server.getStatus().name().equalsIgnoreCase(status) + || ServerStatus.EXCLUDED.name().equalsIgnoreCase(status)) .collect(Collectors.toList()); serverList.sort(Comparator.comparing(ServerNode::getId)); return Response.success(serverList); diff --git a/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue b/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue index 43d23ee3e2..3ecf7b1a07 100644 --- a/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue +++ b/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue @@ -21,7 +21,7 @@ @@ -37,7 +37,7 @@ @@ -55,7 +55,7 @@ @@ -73,7 +73,7 @@ @@ -90,7 +90,7 @@ @@ -106,7 +106,7 @@ diff --git a/dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue b/dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue deleted file mode 100644 index e12768fddd..0000000000 --- a/dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - diff --git a/dashboard/src/main/webapp/src/pages/serverstatus/NodeListPage.vue b/dashboard/src/main/webapp/src/pages/serverstatus/NodeListPage.vue index ac92a1b8ac..9af0682fa6 100644 --- a/dashboard/src/main/webapp/src/pages/serverstatus/NodeListPage.vue +++ b/dashboard/src/main/webapp/src/pages/serverstatus/NodeListPage.vue @@ -17,13 +17,18 @@ + + \ No newline at end of file diff --git a/dashboard/src/main/webapp/src/router/index.js b/dashboard/src/main/webapp/src/router/index.js index f0b6bb8e75..114ccdb3f3 100644 --- a/dashboard/src/main/webapp/src/router/index.js +++ b/dashboard/src/main/webapp/src/router/index.js @@ -20,7 +20,6 @@ import ApplicationPage from '@/pages/ApplicationPage.vue' import DashboardPage from '@/pages/DashboardPage.vue' import CoordinatorServerPage from '@/pages/CoordinatorServerPage.vue' import ShuffleServerPage from '@/pages/ShuffleServerPage.vue' -import ExcludeNodeList from '@/pages/serverstatus/ExcludeNodeList' import NodeListPage from '@/pages/serverstatus/NodeListPage.vue' const routes = [ @@ -68,7 +67,7 @@ const routes = [ { path: '/shuffleserverpage/excludeNodeList', name: 'excludeNodeList', - component: ExcludeNodeList + component: NodeListPage } ] },