]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit
ceph-handler: Use /proc/net/unix for rgw socket
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 6 Aug 2019 15:41:02 +0000 (11:41 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 7 Nov 2019 13:41:11 +0000 (14:41 +0100)
commit60cbfdc2a60520e4cd14ee6f54acdc511092b77e
treea15d1a67d7f9f335acba937519067638feecd5e8
parent34b03d1873f6a5fba8baddbf61b08b50a224e555
ceph-handler: Use /proc/net/unix for rgw socket

If for some reason, there's an old rgw socket file present in the
/var/run/ceph/ directory then the test command could fail with

test: xxxxxxxxx.asok: binary operator expected

$ ls -hl /var/run/ceph/
total 0
srwxr-xr-x. ceph-client.rgw.rgw0.rgw0.68.94153614631472.asok
srwxr-xr-x. ceph-client.rgw.rgw0.rgw0.68.94240997655088.asok

We can check the radosgw socket in /proc/net/unix to avoid using wildcard
in the socket name.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-handler/templates/restart_rgw_daemon.sh.j2