Fix set_route handler in ldmsd Python module and interface

ovis-hpc · Dec 10, 2024 · e266f7e · e266f7e
1 parent 38fbac8
commit e266f7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/ldms/python/ldmsd/ldmsd_communicator.py b/ldms/python/ldmsd/ldmsd_communicator.py
@@ -1256,7 +1256,7 @@ def set_route(self, instance):
         try:
             req.send(self)
             resp = req.receive(self)
-            return resp['errcode'], resp['attr_list']
+            return resp['errcode'], resp['msg']
         except Exception as e:
             return errno.ENOTCONN, str(e)
 

diff --git a/ldms/python/ldmsd/ldmsd_controller b/ldms/python/ldmsd/ldmsd_controller
@@ -1749,16 +1749,13 @@ class LdmsdCmdParser(cmd.Cmd):
         if not arg:
             return
         rc, msg = self.comm.set_route(arg['instance'])
-        attr_list = msg
-        if attr_list is None:
-            print("No response back")
 
-        if attr_list[0].attr_id != LDMSD_Req_Attr.JSON:
-            # Assume that this is an error message
+        if rc:
+            print(f"Error {rc}: {msg}")
             return
 
         try:
-            src = json.loads(attr_list[0].attr_value)
+            src = json.loads(msg)
             route = src['route']
             print("---------------------")
             print("instance: '{0}'".format(src['instance']))
@@ -1774,14 +1771,14 @@ class LdmsdCmdParser(cmd.Cmd):
                     print("{0:20} {1:15} {2:15} {3:15} {4:10} {5:10} {6:5} {7:25} {8:25}".format(
                         hop['host'], hop['type'], detail['name'], detail['host'], detail['update_int'],
                         detail['update_off'], detail['update_sync'],
-                        self.__ts2human(detail['last_start_sec'], detail['last_start_usec']),
-                        self.__ts2human(detail['last_end_sec'], detail['last_end_usec'])))
+                        self.__ts2human(detail['last_start_sec'], detail['last_start_nsec']),
+                        self.__ts2human(detail['last_end_sec'], detail['last_end_nsec'])))
                 else:
                     print("{0:20} {1:15} {2:15} {3:15} {4:10} {5:10} {6:5} {7:25} {8:25}".format(
                         hop['host'], hop['type'], detail['name'], "---", detail['interval_us'],
                         detail['offset_us'], detail['sync'],
-                        self.__ts2human(detail['trans_start_sec'], detail['trans_start_usec']),
-                        self.__ts2human(detail['trans_end_sec'], detail['trans_end_usec'])))
+                        self.__ts2human(detail['trans_start_sec'], detail['trans_start_nsec']),
+                        self.__ts2human(detail['trans_end_sec'], detail['trans_end_nsec'])))
         except:
             raise