Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
ceph.2107
0005-Revert-rgw-init-script-waits-until-.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0005-Revert-rgw-init-script-waits-until-.patch of Package ceph.2107
From: Nathan Cutler <ncutler@suse.com> Date: Tue, 2 Feb 2016 11:39:17 +0100 Subject: [PATCH] Revert "rgw: init script waits until the radosgw stops" This reverts commit 3be204f6a22be109d2aa8cfd5cee09ec3381d9b2. Which gets in the way of our "Convert remaining init script actions over to suse" patch. --- src/init-radosgw | 10 +--------- src/init-radosgw.sysv | 11 ----------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/init-radosgw b/src/init-radosgw index 8f6f4e8..e0ebf6d 100644 --- a/src/init-radosgw +++ b/src/init-radosgw @@ -87,15 +87,7 @@ case "$1" in $0 start ;; stop) - timeout=0 - for name in `ceph-conf --list-sections $PREFIX`; - do - t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs` - if [ $t -gt $timeout ]; then timeout=$t; fi - done - - if [ $timeout -gt 0 ]; then TIMEOUT="-R $timeout"; fi - start-stop-daemon --stop -x $RADOSGW --oknodo $TIMEOUT + start-stop-daemon --stop -x $RADOSGW --oknodo ;; status) /sbin/checkproc $RADOSGW diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv index 533075a..7695457 100644 --- a/src/init-radosgw.sysv +++ b/src/init-radosgw.sysv @@ -101,19 +101,8 @@ case "$1" in ;; stop) #start-stop-daemon --stop -x $RADOSGW --oknodo - timeout=0 - for name in `ceph-conf --list-sections $PREFIX`; - do - t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs` - if [ $t -gt $timeout ]; then timeout=$t; fi - done - killproc $RADOSGW echo "Stopping radosgw instance(s)..." - while pidof $RADOSGW >/dev/null && [ $timeout -gt 0 ] ; do - sleep 1 - timeout=$(($timeout - 1)) - done ;; status) daemon_is_running $RADOSGW
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor