]> 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)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Mon, 3 Feb 2020 14:31:52 +0000 (09:31 -0500)
commit0dbca448d1753f4d05233880c43445f7418dad6b
treef77102d514fd3503dee81d640798dfeeeb042336
parent487be2675a34b6e85350d3bfd7346e9a7427164c
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>
(cherry picked from commit 60cbfdc2a60520e4cd14ee6f54acdc511092b77e)
roles/ceph-handler/templates/restart_rgw_daemon.sh.j2