From 5235aa83230cf6043d4816cd1e36c6aaf154f1bb Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Tue, 25 Feb 2020 11:46:45 +0100 Subject: [PATCH] B #4249: CEPH monitors store attr might be missing (#4254) --- src/datastore_mad/remotes/ceph/ceph_utils.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/datastore_mad/remotes/ceph/ceph_utils.sh b/src/datastore_mad/remotes/ceph/ceph_utils.sh index d64d4e6dd8..ddbbcbc2bd 100644 --- a/src/datastore_mad/remotes/ceph/ceph_utils.sh +++ b/src/datastore_mad/remotes/ceph/ceph_utils.sh @@ -208,7 +208,8 @@ rbd_rm_r() { #-------------------------------------------------------------------------------- rbd_df_monitor() { - local monitor_data i j xpath_elements pool_name stored quota_bytes free + local monitor_data i j xpath_elements pool_name + local quota_bytes free bytes_used stored monitor_data=$1 pool_name=$2 @@ -216,13 +217,19 @@ rbd_df_monitor() { while IFS= read -r -d '' element; do xpath_elements[i++]="$element" done < <(echo $monitor_data | $XPATH \ - "/stats/pools/pool[name = \"${pool_name}\"]/stats/stored" \ "/stats/pools/pool[name = \"${pool_name}\"]/stats/quota_bytes" \ - "/stats/pools/pool[name = \"${pool_name}\"]/stats/max_avail") + "/stats/pools/pool[name = \"${pool_name}\"]/stats/max_avail" \ + "/stats/pools/pool[name = \"${pool_name}\"]/stats/bytes_used" \ + "/stats/pools/pool[name = \"${pool_name}\"]/stats/stored") - stored="${xpath_elements[j++]:-0}" quota_bytes="${xpath_elements[j++]:-0}" free="${xpath_elements[j++]:-0}" + bytes_used="${xpath_elements[j++]:-0}" + stored="${xpath_elements[j++]:-0}" + + # https://docs.ceph.com/docs/master/releases/nautilus/ + # ‘BYTES USED’ column renamed to ‘STORED’. Represents amount of data stored by the user. + [ $stored = "0" ] && stored=$bytes_used if [ $quota_bytes -ne 0 ]; then if [ $quota_bytes -lt $free ]; then