ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

defaults: restart docker daemon higher delay 

Use default delay since the mon (in particular) can take more time to
restart.
Solves error with:

STDERR:

Error response from daemon: No such container: ceph-mon-mon0

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1898/head
Sébastien Han 2017-09-14 13:38:11 -06:00
parent 0d3b1b8d1f
commit ed3003cf41
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-defaults/templates/restart_mon_daemon.sh.j2
View File

@ -27,7 +27,7 @@ COUNT=10
# Wait and ensure the socket exists after restarting the daemon # Wait and ensure the socket exists after restarting the daemon
while [ $COUNT -ne 0 ]; do while [ $COUNT -ne 0 ]; do
{{ docker_exec_cmd }} test -S $SOCKET && check_quorum {{ docker_exec_cmd }} test -S $SOCKET && check_quorum
sleep 1 sleep $DELAY
let COUNT=COUNT-1 let COUNT=COUNT-1
done done
# If we reach this point, it means the socket is not present. # If we reach this point, it means the socket is not present.

4
roles/ceph-defaults/templates/restart_osd_daemon.sh.j2
View File

@ -39,7 +39,7 @@ get_docker_id_from_dev_name() {
while [ $count -ne 0 ]; do while [ $count -ne 0 ]; do
id=$(docker ps -q -f "name=$1") id=$(docker ps -q -f "name=$1")
test "$id" != "" && break test "$id" != "" && break
sleep 1 sleep $DELAY
let count=count-1 let count=count-1
done done
echo "$id" echo "$id"
@ -69,7 +69,7 @@ for unit in $(systemctl list-units | grep "loaded active" | grep -oE "ceph-osd@(
SOCKET=/var/run/ceph/{{ cluster }}-osd.${osd_id}.asok SOCKET=/var/run/ceph/{{ cluster }}-osd.${osd_id}.asok
while [ $COUNT -ne 0 ]; do while [ $COUNT -ne 0 ]; do
$docker_exec test -S "$SOCKET" && check_pgs && continue 2 $docker_exec test -S "$SOCKET" && check_pgs && continue 2
sleep 1 sleep $DELAY
let COUNT=COUNT-1 let COUNT=COUNT-1
done done
# If we reach this point, it means the socket is not present. # If we reach this point, it means the socket is not present.

2
roles/ceph-defaults/templates/restart_rgw_daemon.sh.j2
View File

@ -58,7 +58,7 @@ COUNT=10
# Wait and ensure the socket exists after restarting the daemon # Wait and ensure the socket exists after restarting the daemon
while [ $COUNT -ne 0 ]; do while [ $COUNT -ne 0 ]; do
{{ docker_exec_cmd }} test -S $SOCKET && check_rest {{ docker_exec_cmd }} test -S $SOCKET && check_rest
sleep 1 sleep $DELAY
let COUNT=COUNT-1 let COUNT=COUNT-1
done done
echo "Socket file ${SOCKET} could not be found, which means Rados Gateway is not running." echo "Socket file ${SOCKET} could not be found, which means Rados Gateway is not running."