From 6272fb21434966af0425b7e453f6f777de831ffb Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Mon, 20 May 2019 04:35:50 -0500 Subject: [PATCH] F #3222: return ec pool usage if used (#3333) (cherry picked from commit f07da23bcec75f3fa35f8883c85c07397ffd68ac) --- src/tm_mad/ceph/monitor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tm_mad/ceph/monitor b/src/tm_mad/ceph/monitor index ca2b11bd52..73a779eff7 100755 --- a/src/tm_mad/ceph/monitor +++ b/src/tm_mad/ceph/monitor @@ -48,12 +48,14 @@ while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \ + /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/EC_POOL_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_KEY \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_CONF) BRIDGE_LIST="${XPATH_ELEMENTS[j++]}" POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}" +EC_POOL_NAME="${XPATH_ELEMENTS[j++]}" CEPH_USER="${XPATH_ELEMENTS[j++]}" CEPH_KEY="${XPATH_ELEMENTS[j++]}" CEPH_CONF="${XPATH_ELEMENTS[j++]}" @@ -78,6 +80,8 @@ if [ -n "$CEPH_CONF" ]; then RADOS="$RADOS --conf ${CEPH_CONF}" fi +[ -n "$EC_POOL_NAME" ] && POOL_NAME="$EC_POOL_NAME" + # ------------ Compute datastore usage ------------- MONITOR_SCRIPT=$(cat <