Rename fields/variables from client id to node id (#12457)

This commit is contained in:
Tao Wang
2020-11-30 14:33:36 +08:00
committed by GitHub
parent 3964defbe1
commit b85c6abc3e
43 changed files with 670 additions and 682 deletions
+10 -10
View File
@@ -766,19 +766,19 @@ class GlobalState:
self._check_connected()
resources = defaultdict(int)
clients = self.node_table()
for client in clients:
# Only count resources from latest entries of live clients.
if client["Alive"]:
for key, value in client["Resources"].items():
nodes = self.node_table()
for node in nodes:
# Only count resources from latest entries of live nodes.
if node["Alive"]:
for key, value in node["Resources"].items():
resources[key] += value
return dict(resources)
def _live_client_ids(self):
"""Returns a set of client IDs corresponding to clients still alive."""
def _live_node_ids(self):
"""Returns a set of node IDs corresponding to nodes still alive."""
return {
client["NodeID"]
for client in self.node_table() if (client["Alive"])
node["NodeID"]
for node in self.node_table() if (node["Alive"])
}
def _available_resources_per_node(self):
@@ -800,7 +800,7 @@ class GlobalState:
available_resources_by_id[node_id] = dynamic_resources
# Update nodes in cluster.
node_ids = self._live_client_ids()
node_ids = self._live_node_ids()
# Remove disconnected nodes.
for node_id in available_resources_by_id.keys():
if node_id not in node_ids: