Merge pull request #770 from NethServer/feat-7201

Implement cluster backup single node cluster flag Refs NethServer/dev#7201
NethServer · Dec 17, 2024 · 509dee0 · 509dee0
2 parents 3904ffb + 1e41b61
commit 509dee0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/core/imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/20save b/core/imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/20save
@@ -73,6 +73,22 @@ fgz = gzip.open(f'{output_dir}/dump.json.gz', mode='r')
 dump = json.loads(fgz.read())
 fgz.close()
 
-result = {'cluster': dump['cluster']['ui_name'] or '', "vpn": dump['vpn']['endpoint'], 'domains': len(dump['cluster']['user_domain']['ldap']), 'backup_repositories': len(dump['cluster']['backup_repository']), "routes": len(dump['traefik']['leader']['routes']), "certificates": len(dump['traefik']['leader']['uploaded_certificates'])}
+if 'node_count' in dump['cluster']:
+    # available since cluster backup version "3"
+    single_node_cluster = dump['cluster']['node_count'] == 1
+else:
+    # fall back to the number of Traefik instances for previous cluster
+    # backups:
+    single_node_cluster = len(dump.get('traefik', {})) == 1
+
+result = {
+    'single_node_cluster': single_node_cluster,
+    'cluster': dump['cluster']['ui_name'] or '',
+    'vpn': dump['vpn']['endpoint'],
+    'domains': len(dump['cluster']['user_domain']['ldap']),
+    'backup_repositories': len(dump['cluster']['backup_repository']),
+    'routes': len(dump['traefik']['leader']['routes']),
+    'certificates': len(dump['traefik']['leader']['uploaded_certificates']),
+}
 
 json.dump(result, fp=sys.stdout)
diff --git a/...imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/validate-output.json b/...imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/validate-output.json
@@ -5,6 +5,7 @@
     "description": "Return info from cluster backup",
     "examples": [
         {
+            "single_node_cluster": true,
             "cluster": "mycluster1",
             "vpn": "cs1.leader.cluster0.gs.nethserver.net:55820",
             "domains": 1,
@@ -13,12 +14,17 @@
     ],
     "type": "object",
     "required": [
+        "single_node_cluster",
         "cluster",
         "vpn",
         "domains",
         "backup_repositories"
     ],
     "properties": {
+        "single_node_cluster": {
+            "type": "boolean",
+            "description": "If true, the backup refers to a cluster of a single node"
+        },
         "cluster": {
             "title": "Cluster label",
             "description": "User defined cluster label, can be empty'",
@@ -40,4 +46,4 @@
             "type": "integer"
         }
     }
-}
+}
diff --git a/core/imageroot/var/lib/nethserver/cluster/bin/cluster-backup b/core/imageroot/var/lib/nethserver/cluster/bin/cluster-backup
@@ -39,9 +39,12 @@ output_dir = f'{os.environ["AGENT_STATE_DIR"]}/backup'
 
 rdb = agent.redis_connect(host='127.0.0.1')
 
-VERSION = "2"
+VERSION = "3"
 
-dump = { 'version': VERSION, 'modules': {}, 'vpn': {}, 'cluster': { 'subscription': {}, 'apply_updates': {}, 'repository': {}, 'backup': {}, 'backup_repository': {}, 'user_domain': { 'ldap': {} },'override': {'modules': {} } }, 'traefik': {} }
+dump = { 'version': VERSION, 'modules': {}, 'vpn': {}, 'cluster': { 'node_count': 0, 'subscription': {}, 'apply_updates': {}, 'repository': {}, 'backup': {}, 'backup_repository': {}, 'user_domain': { 'ldap': {} },'override': {'modules': {} } }, 'traefik': {} }
+
+# cluster: number of nodes
+dump['cluster']['node_count'] = len(set(rdb.hvals('cluster/module_node'))
 
 # cluster: subscription
 dump['cluster']['subscription'] = rdb.hgetall('cluster/subscription') or {}