mirror of https://github.com/ceph/ceph-ansible.git
d4a3e26534
Since Mimic the radosgw socket has two extra fields in the socket
name (before the .asok suffix): <pid>.<ctid>
Before:
/var/run/ceph/ceph-client.rgw.cephaio-1.asok
After:
/var/run/ceph/ceph-client.rgw.cephaio-1.16913.23928832.asok
The radosgw restart script doesn't handle this and could fail during
an upgrade.
If the SOCKETS variable isn't defined in the script then the test
command won't fail because the return code is 0
$ test -S
$ echo $?
0
There multiple issues in that script:
- The default SOCKETS value isn't defined due to a typo
SOCKET vs SOCKETS.
- Because the socket name uses the pid then we need to check the
socket name after the service restart.
- After restarting the radosgw service we need to wait few seconds
otherwise the socket won't be created.
- Update the wget parameters because the command is doing a loop.
We now use the same option than curl.
- The check_rest function doesn't test the radosgw at all due to
a wrong test command (test against a string) and always returns 0.
This needs to use the DOCKER_EXECS variable in order to execute the
command.
$ test 'wget http://192.168.100.11:8080'
$ echo $?
0
Also remove the test based on the ansible_fqdn because we only use
the ansible_hostname + rgw instance name.
Finally group all for loop into a single one.
Resolves: #3926
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| restart_mds_daemon.sh.j2 | ||
| restart_mgr_daemon.sh.j2 | ||
| restart_mon_daemon.sh.j2 | ||
| restart_nfs_daemon.sh.j2 | ||
| restart_osd_daemon.sh.j2 | ||
| restart_rbd_mirror_daemon.sh.j2 | ||
| restart_rbd_target_api.sh.j2 | ||
| restart_rbd_target_gw.sh.j2 | ||
| restart_rgw_daemon.sh.j2 | ||
| restart_tcmu_runner.sh.j2 | ||