]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: use ceph-conf to get cluster configuration value 27538/head
authorChangcheng Liu <changcheng.liu@intel.com>
Fri, 12 Apr 2019 03:55:28 +0000 (11:55 +0800)
committerChangcheng Liu <changcheng.liu@intel.com>
Fri, 12 Apr 2019 17:23:25 +0000 (01:23 +0800)
Sometimes, cluster isn't up and radosgw hang there for
getting configuration value. Use ceph-conf instead of
radosgw to get the value.

Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
Tested-by: Changcheng Liu <changcheng.liu@intel.com>
src/init-radosgw

index fbb99081753bb6c939c42d1e47860fd82f344640..768d27bdb8b858041ea07699d14e7c6189846691 100644 (file)
@@ -86,7 +86,7 @@ case "$1" in
                 user="$DEFAULT_USER"
             fi
 
-            log_file=`$RADOSGW -n $name --show-config-value log_file`
+            log_file=`ceph-conf -n $name --show-config-value log_file`
             if [ -n "$log_file" ]; then
                 if [ ! -e "$log_file" ]; then
                     touch "$log_file"
@@ -123,7 +123,7 @@ case "$1" in
         timeout=0
         for name in $dlist
         do
-          t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs`
+          t=`ceph-conf -n $name --show-config-value rgw_exit_timeout_secs`
           if [ $t -gt $timeout ]; then timeout=$t; fi
         done