optimize

Author: BalaBalaYi

dlrover/python/common/grpc.py

@@ -493,8 +493,6 @@ class WorkerDiagnosisData(Message):
     type: str = ""
     timestamp: int = 0
     content: str = ""
-    node_id: int = -1
-    node_type: str = ""
     node_rank: int = -1
 
 

dlrover/python/diagnosis/common/diagnosis_data.py

@@ -52,8 +52,6 @@ def __init__(
         timestamp: int = 0,
         data_type: str = DiagnosisDataType.GENERIC,
         data_content: str = "",
-        node_id: int = -1,
-        node_type: str = "",
         node_rank: int = -1,
     ):
         """
@@ -62,24 +60,12 @@ def __init__(
         Args:
             data_type (str): Type of metric. Defaults to "GENERIC".
             data_content (str): Content of the metric. Defaults to "".
-            node_id (int): Node ID. Defaults to -1.
-            node_type (str): Node type. Defaults to "".
             node_rank (int): Node rank. Defaults to -1.
         """
 
         super().__init__(timestamp, data_type, data_content)
-        self._node_id = node_id
-        self._node_type = node_type
         self._node_rank = node_rank
 
-    @property
-    def node_id(self):
-        return self._node_id
-
-    @property
-    def node_type(self):
-        return self._node_type
-
     @property
     def node_rank(self):
         return self._node_rank
@@ -91,8 +77,6 @@ def __init__(
         timestamp: int = 0,
         data_type: str = DiagnosisDataType.GENERIC,
         data_content: str = "",
-        node_id: int = -1,
-        node_type: str = "",
         node_rank: int = -1,
         is_final_result=False,
         need_report=False,
@@ -107,14 +91,10 @@ def __init__(
                 result or not. Defaults to False.
             need_report (bool, optional): Whether the metric needs
                 report(to Brain). Defaults to False.
-            node_id (int): Node ID. Defaults to -1.
-            node_type (str): Node type. Defaults to "".
             node_rank (int): Node rank. Defaults to -1.
         """
 
-        super().__init__(
-            timestamp, data_type, data_content, node_id, node_type, node_rank
-        )
+        super().__init__(timestamp, data_type, data_content, node_rank)
         self._is_final_result = is_final_result
         self._need_report = need_report
 
@@ -144,8 +124,6 @@ def __init__(self, timestamp: int = 0, logs: List[str] = None):
             timestamp,
             DiagnosisDataType.TRAINING_LOG,
             data_content,
-            env_utils.get_node_id(),
-            env_utils.get_node_type(),
             env_utils.get_node_rank(),
         )
 

dlrover/python/elastic_agent/master_client.py

@@ -387,8 +387,6 @@ def report_diagnosis_agent_metrics(self, data: WorkerDiagnosisData):
             data.data_type,
             data.timestamp,
             data.data_content,
-            data.node_id,
-            data.node_type,
             data.node_rank,
         )
         self._report(message)