]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
common: ping existing admin socket before unlink 1247/head 1406/head
authorLoic Dachary <loic@dachary.org>
Sat, 15 Feb 2014 10:43:13 +0000 (11:43 +0100)
committerLoic Dachary <loic@dachary.org>
Sat, 8 Mar 2014 14:48:00 +0000 (15:48 +0100)
commit3f5fc965b2682289ef5cad7d7e053d7bd1b6b39a
treede0a0e02082bd79884123f8ca85e12f234baed67
parentdd703345fc5b46f5421c081a88aa088a8205f515
common: ping existing admin socket before unlink

When a daemon initializes it tries to create an admin socket and unlinks
any pre-existing file, regardless. If such a file is in use, it causes
the existing daemon to loose its admin socket.

The AdminSocketClient::ping is implemented to probe an existing socket,
using the "0" message. The AdminSocket::bind_and_listen function is
modified to call ping() on when it finds existing file. It unlinks the
file only if the ping fails.

http://tracker.ceph.com/issues/7188 fixes: #7188

Backport: emperor, dumpling
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 45600789f1ca399dddc5870254e5db883fb29b38)
src/common/admin_socket.cc
src/common/admin_socket_client.cc
src/common/admin_socket_client.h
src/test/admin_socket.cc