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

handler: add rgw multi-instances support 

This commit adds the rgw multi-instances support in ceph-handler
(restart_rgw_daemons.sh.j2)

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
pull/5146/head
Dimitri Savineau 2020-03-12 17:06:55 +01:00 committed by Dimitri Savineau
parent 60a2e28189
commit 3626c688cf
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
View File

@ -3,24 +3,25 @@
RETRIES="{{ handler_health_rgw_check_retries }}" RETRIES="{{ handler_health_rgw_check_retries }}"
DELAY="{{ handler_health_rgw_check_delay }}" DELAY="{{ handler_health_rgw_check_delay }}"
HOST_NAME="{{ ansible_hostname }}" HOST_NAME="{{ ansible_hostname }}"
RGW_NUMS={{ radosgw_num_instances }} RGW_NUMS={{ rgw_instances | length | int }}
RGW_BASE_PORT={{ radosgw_frontend_port }}
RGW_FRONTEND_SSL_CERT={{ radosgw_frontend_ssl_certificate }} RGW_FRONTEND_SSL_CERT={{ radosgw_frontend_ssl_certificate }}
if [ -n "$RGW_FRONTEND_SSL_CERT" ]; then if [ -n "$RGW_FRONTEND_SSL_CERT" ]; then
RGW_PROTOCOL=https RGW_PROTOCOL=https
else else
RGW_PROTOCOL=http RGW_PROTOCOL=http
fi fi
INSTANCES_NAME=({% for i in rgw_instances %}{{ i.instance_name }} {% endfor %})
RGW_IPS=({% for i in rgw_instances %}{{ i.radosgw_address }} {% endfor %})
RGW_PORTS=({% for i in rgw_instances %}{{ i.radosgw_frontend_port }} {% endfor %})
declare -a DOCKER_EXECS declare -a DOCKER_EXECS
declare -a SOCKET_PREFIX
for ((i=0; i<${RGW_NUMS}; i++)); do for ((i=0; i<${RGW_NUMS}; i++)); do
SOCKET_PREFIX[i]="/var/run/ceph/{{ cluster }}-client.rgw.${HOST_NAME}.${INSTANCES_NAME[i]}"
DOCKER_EXECS[i]="" DOCKER_EXECS[i]=""
{% if containerized_deployment | bool %} {% if containerized_deployment | bool %}
CONTAINER_NAME="ceph-rgw-${HOST_NAME}-rgw${i}" DOCKER_EXECS[i]="{{ container_binary }} exec ceph-rgw-${HOST_NAME}-${INSTANCES_NAME[i]}"
DOCKER_EXECS[i]="{{ container_binary }} exec ${CONTAINER_NAME}"
{% endif %} {% endif %}
done done
RGW_IP={{ hostvars[inventory_hostname]['_radosgw_address'] }}
SOCKET_PREFIX="/var/run/ceph/{{ cluster }}-client.rgw.${HOST_NAME}.rgw"
check_socket() { check_socket() {
local i=$1 local i=$1
@ -28,7 +29,7 @@ check_socket() {
local count=10 local 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
SOCKET=$(grep ${SOCKET_PREFIX}${i} /proc/net/unix | awk '{ print $8 }') SOCKET=$(grep ${SOCKET_PREFIX[i]} /proc/net/unix | awk '{ print $8 }')
if [ -n "${SOCKET}" ]; then if [ -n "${SOCKET}" ]; then
${DOCKER_EXECS[i]} test -S ${SOCKET} && succ=$((succ+1)) && break ${DOCKER_EXECS[i]} test -S ${SOCKET} && succ=$((succ+1)) && break
fi fi
@ -37,7 +38,7 @@ check_socket() {
done done
if [ $succ -ne 1 ]; then if [ $succ -ne 1 ]; then
echo "Socket file ${SOCKET} could not be found, which means Rados Gateway is not running. Showing ceph-rgw unit logs now:" echo "Socket file ${SOCKET} could not be found, which means Rados Gateway is not running. Showing ceph-rgw unit logs now:"
journalctl -u ceph-radosgw@rgw.${HOST_NAME}.rgw${i} journalctl -u ceph-radosgw@rgw.${HOST_NAME}.${INSTANCES_NAME[i]}
exit 1 exit 1
fi fi
} }
@ -60,20 +61,20 @@ check_rest() {
check_for_curl_or_wget ${i} check_for_curl_or_wget ${i}
local succ=0 local succ=0
while [ $RETRIES -ne 0 ]; do while [ $RETRIES -ne 0 ]; do
${DOCKER_EXECS[i]} $rgw_test_command $RGW_PROTOCOL://$RGW_IP:$((RGW_BASE_PORT+i)) && succ=$((succ+1)) && break ${DOCKER_EXECS[i]} $rgw_test_command $RGW_PROTOCOL://${RGW_IPS[i]}:${RGW_PORTS[i]} && succ=$((succ+1)) && break
sleep $DELAY sleep $DELAY
let RETRIES=RETRIES-1 let RETRIES=RETRIES-1
done done
if [ $succ -ne 1 ]; then if [ $succ -ne 1 ]; then
# If we reach this point, it means there is a problem with the connection to rgw # If we reach this point, it means there is a problem with the connection to rgw
echo "Error connecting locally to Rados Gateway service: $RGW_PROTOCOL://$RGW_IP:$((RGW_BASE_PORT+i))" echo "Error connecting locally to Rados Gateway service: $RGW_PROTOCOL://${RGW_IPS[i]}:${RGW_PORTS[i]}"
exit 1 exit 1
fi fi
} }
for ((i=0; i<${RGW_NUMS}; i++)); do for ((i=0; i<${RGW_NUMS}; i++)); do
# First, restart the daemon # First, restart the daemon
systemctl restart ceph-radosgw@rgw.${HOST_NAME}.rgw${i} systemctl restart ceph-radosgw@rgw.${HOST_NAME}.${INSTANCES_NAME[i]}
# Check socket files # Check socket files
check_socket ${i} check_socket ${i}
# Check rest # Check rest