Merge branch 'master' into redox/20250331-ruleset-edges

Author: vEpiphyte

changes/1508bffbdfc8ed831a10290dde2672cc.yaml

@@ -0,0 +1,6 @@
+---
+desc: Updated the ``aha.svc.mirror`` command to print the individual service version
+  alongside the Synapse version.
+prs: []
+type: feat
+...

synapse/lib/stormlib/aha.py

@@ -691,6 +691,7 @@ async def _methPoolSvcDel(self, svcname):
                     {"name": "host", "width": 16},
                     {"name": "port", "width": 8},
                     {"name": "version", "width": 12},
+                    {"name": "synapse", "width": 12},
                     {"name": "nexus idx", "width": 10},
                 ],
                 "separators": {
@@ -732,6 +733,7 @@ async def _methPoolSvcDel(self, svcname):
                     'host': $svcinfo.urlinfo.host,
                     'port': $svcinfo.urlinfo.port,
                     'version': '<unknown>',
+                    'synapse_version': '<unknown>',
                     'nexs_indx': (0)
                 })
                 if ($cell_infos.$svcname) {
@@ -743,7 +745,8 @@ async def _methPoolSvcDel(self, svcname):
                     } else {
                         $status.role = 'leader'
                     }
-                    $status.version = $info.synapse.verstring
+                    $status.version = $info.cell.verstring
+                    $status.synapse_version = $info.synapse.verstring
                 }
                 $group_status.append($status)
             }
@@ -779,6 +782,7 @@ async def _methPoolSvcDel(self, svcname):
                     $status.host,
                     $status.port,
                     $status.version,
+                    $status.synapse_version,
                     $status.nexs_indx
                 )
                 $lib.print($printer.row($row))

synapse/tools/aha/mirror.py

@@ -41,6 +41,7 @@ def build_status_list(members, cell_infos):
             'host': svcinfo.get('urlinfo', {}).get('host', ''),
             'port': str(svcinfo.get('urlinfo', {}).get('port', '')),
             'version': '<unknown>',
+            'synapse': '<unknown>',
             'nexs_indx': 0
         }
         if svcname in cell_infos:
@@ -49,23 +50,24 @@ def build_status_list(members, cell_infos):
             status.update({
                 'nexs_indx': cell_info.get('nexsindx', 0),
                 'role': 'follower' if cell_info.get('uplink') else 'leader',
-                'version': str(info.get('synapse', {}).get('verstring', '')),
+                'version': str(info.get('cell', {}).get('verstring', '')),
+                'synapse': str(info.get('synapse', {}).get('verstring', '')),
                 'online': 'True',
                 'ready': str(cell_info.get('ready', False))
             })
         group_status.append(status)
     return group_status
 
 def output_status(outp, vname, group_status):
-    header = ' {:<40} {:<10} {:<8} {:<7} {:<16} {:<9} {:<12} {:<10}'.format(
-        'name', 'role', 'online', 'ready', 'host', 'port', 'version', 'nexus idx')
+    header = ' {:<40} {:<10} {:<8} {:<7} {:<16} {:<9} {:<12} {:<12} {:<10}'.format(
+        'name', 'role', 'online', 'ready', 'host', 'port', 'version', 'synapse', 'nexus idx')
     outp.printf(header)
     outp.printf('#' * 120)
     outp.printf(vname)
     for status in group_status:
         if status['nexs_indx'] == 0:
             status['nexs_indx'] = '<unknown>'
-        line = ' {name:<40} {role:<10} {online:<8} {ready:<7} {host:<16} {port:<9} {version:<12} {nexs_indx:<10}'.format(**status)
+        line = ' {name:<40} {role:<10} {online:<8} {ready:<7} {host:<16} {port:<9} {version:<12} {synapse:<12} {nexs_indx:<10}'.format(**status)
         outp.printf(line)
 
 def check_sync_status(group_status):