Skip to content

Default to reading cluster information from librados #42

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

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Default to reading cluster information from librados #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8e10b
Default to reading cluster information from librados
davidturner-sie Sep 4, 2024
935f4d0
incorporating changes made in PR #41
davidturner-sie Sep 4, 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
67 changes: 51 additions & 16 deletions tools/upmap/upmap-remapped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,31 @@

import json, subprocess, sys

try:
import rados
cluster = rados.Rados(conffile='/etc/ceph/ceph.conf')
cluster.connect()
except:
use_shell = True
else:
use_shell = False

def eprint(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)

try:
OSDS = json.loads(subprocess.getoutput('ceph osd ls -f json | jq -r'))
DF = json.loads(subprocess.getoutput('ceph osd df -f json | jq -r .nodes'))
if use_shell:
OSDS = json.loads(subprocess.getoutput('ceph osd ls -f json | jq -r .'))
DF = json.loads(subprocess.getoutput('ceph osd df -f json | jq -r .nodes'))
else:
cmd = {"prefix": "osd ls", "format": "json"}
ret, output, errs = cluster.mon_command(json.dumps(cmd), b'', timeout=5)
output = output.decode('utf-8').strip()
OSDS = json.loads(output)
cmd = {"prefix": "osd df", "format": "json"}
ret, output, errs = cluster.mon_command(json.dumps(cmd), b'', timeout=5)
output = output.decode('utf-8').strip()
DF = json.loads(output)['nodes']
except ValueError:
eprint('Error loading OSD IDs')
sys.exit(1)
Expand Down Expand Up @@ -93,29 +112,44 @@ def rm_upmap_pg_items(pgid):

# discover remapped pgs
try:
remapped_json = subprocess.getoutput('ceph pg ls remapped -f json | jq -r')
remapped = json.loads(remapped_json)
if use_shell:
remapped_json = subprocess.getoutput('ceph pg ls remapped -f json | jq -r .')
else:
cmd = {"prefix": "pg ls", "states": ["remapped"], "format": "json"}
ret, output, err = cluster.mon_command(json.dumps(cmd), b'', timeout=5)
remapped_json = output.decode('utf-8').strip()
try:
remapped = json.loads(remapped_json)['pg_stats']
except KeyError:
eprint("There are no remapped PGs")
sys.exit(0)
except ValueError:
eprint('Error loading remapped pgs')
sys.exit(1)

# nautilus compat
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nautilus is 5 major versions ago. No need to mention when the change to the json output happened. Also moved it inside of the initial try block.

try:
_remapped = remapped['pg_stats']
remapped = _remapped
except KeyError:
eprint("There are no remapped PGs")
sys.exit(0)

# discover existing upmaps
osd_dump_json = subprocess.getoutput('ceph osd dump -f json | jq -r')
osd_dump = json.loads(osd_dump_json)
upmaps = osd_dump['pg_upmap_items']
try:
if use_shell:
osd_dump_json = subprocess.getoutput('ceph osd dump -f json | jq -r .')
else:
cmd = {"prefix": "osd dump", "format": "json"}
ret, output, errs = cluster.mon_command(json.dumps(cmd), b'', timeout=5)
osd_dump_json = output.decode('utf-8').strip()
upmaps = json.loads(osd_dump_json)['pg_upmap_items']
except ValueError:
eprint('Error loading existing upmaps')
sys.exit(1)

# discover pools replicated or erasure
pool_type = {}
try:
for line in subprocess.getoutput('ceph osd pool ls detail').split('\n'):
if use_shell:
osd_pool_ls_detail = subprocess.getoutput('ceph osd pool ls detail')
else:
cmd = {"prefix": "osd pool ls", "detail": "detail", "format": "plain"}
ret, output, errs = cluster.mon_command(json.dumps(cmd), b'', timeout=5)
osd_pool_ls_detail = output.decode('utf-8').strip()
for line in osd_pool_ls_detail.split('\n'):
if 'pool' in line:
x = line.split(' ')
pool_type[x[1]] = x[3]
Expand Down Expand Up @@ -171,3 +205,4 @@ def rm_upmap_pg_items(pgid):
num += 1

print('wait; sleep 4; while ceph status | grep -q "peering\|activating\|laggy"; do sleep 2; done')
cluster.shutdown()