From 7d4226caaa9574df3c7c37a4a95c73c2bbf05df7 Mon Sep 17 00:00:00 2001 From: JackZielke Date: Wed, 4 Mar 2015 16:42:01 -0500 Subject: [PATCH] [PATCH] 3 small updates to fix the monitor script There are some inconsistent variables and some unescaped special characters that prevent this script from working for me. --- src/datastore_mad/remotes/ceph/monitor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor index 346581f51f..02a22c2aba 100755 --- a/src/datastore_mad/remotes/ceph/monitor +++ b/src/datastore_mad/remotes/ceph/monitor @@ -61,7 +61,7 @@ if [ -z "$HOST" ]; then fi if [ -n "$CEPH_USER" ]; then - RADOS="$RADOS --id ${CEPH_USER}" + CEPH="$CEPH --id ${CEPH_USER}" fi # ------------ Compute datastore usage ------------- @@ -72,8 +72,8 @@ to_mb() { units=\$(echo "\$1" | sed 's/^[0123456789]*//g' | tr '[:upper:]' '[:lower:]') case "\$units" in - t|tb) value=\$(expr \$value * 1024 * 1024) ;; - g|gb) value=\$(expr \$value * 1024) ;; + t|tb) value=\$(expr \$value \* 1024 \* 1024) ;; + g|gb) value=\$(expr \$value \* 1024) ;; m|mb) value=\$value ;; k|kb) value=\$(expr \$value / 1024) ;; b|'') value=0 ;; @@ -82,7 +82,7 @@ to_mb() { echo "\$value" } -MAXAVAIL=\$($CEPH df | grep "$POOL_NAME" | awk '{print \$5}') +MAX_AVAIL=\$($CEPH df | grep "$POOL_NAME" | awk '{print \$5}') USED=\$($CEPH df | grep "$POOL_NAME" | awk '{print \$3}') USED_MB=\$(to_mb \$USED)