Skip to content

K
k3s
Commit 9712a805 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #49394 from wwwtyro/rye/rbd-stats-improvement

Automatic merge from submit-queue (batch tested with PRs 49326, 49394, 49346, 49379, 49399) more robust stat handling from ceph df output in the kubernetes-master charm create-rbd-pv action **What this PR does / why we need it**: more robust stat handling from ceph df output in the kubernetes-master charm create-rbd-pv action **Release note**: ```release-note more robust stat handling from ceph df output in the kubernetes-master charm create-rbd-pv action ```
parents 1dbe09b1 1c21e8ab
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
cluster/juju/layers/kubernetes-master/actions/create-rbd-pv
View file @ 9712a805
......@@ -23,6 +23,7 @@ from subprocess import check_call
from subprocess import check_output
from subprocess import CalledProcessError
from tempfile import TemporaryDirectory
import json
import re
import os
import sys
......@@ -179,14 +180,13 @@ def get_monitors():
def get_available_space():
''' Determine the space available in the RBD pool. Throw an exception if
the RBD pool ('rbd') isn't found. '''
command = ['ceph', 'df']
command = 'ceph df -f json'.split()
debug_command(command)
out = check_output(command).decode('utf-8')
for line in out.splitlines():
stripped = line.strip()
if stripped.startswith('rbd'):
M = stripped.split()[-2].replace('M', '')
return int(M)
data = json.loads(out)
for pool in data['pools']:
if pool['name'] == 'rbd':
return int(pool['stats']['max_avail'] / (1024 * 1024))
raise UnknownAvailableSpaceException('Unable to determine available space.') # noqa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment