Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement cluster backup single node cluster flag #770

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Implement cluster backup single node cluster flag #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84d5b1e
chore: format Python code
DavidePrincipi Dec 13, 2024
7c0ea5e
Implement "single_node_cluster" attribute
DavidePrincipi Dec 13, 2024
d378d1c
Cluster-backup format version "3"
DavidePrincipi Dec 16, 2024
1e41b61
Update retrieve-cluster-backup JSON output schema
DavidePrincipi Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion core/imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/20save
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 7 additions & 1 deletion ...imageroot/var/lib/nethserver/cluster/actions/retrieve-cluster-backup/validate-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'",
Expand All @@ -40,4 +46,4 @@
"type": "integer"
}
}
}
}
7 changes: 5 additions & 2 deletions core/imageroot/var/lib/nethserver/cluster/bin/cluster-backup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Loading