]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
common: ping existing admin socket before unlink 1246/head
authorLoic Dachary <loic@dachary.org>
Sat, 15 Feb 2014 10:43:13 +0000 (11:43 +0100)
committerLoic Dachary <loic@dachary.org>
Sat, 15 Feb 2014 23:05:54 +0000 (00:05 +0100)
commit45600789f1ca399dddc5870254e5db883fb29b38
treebecf92aa6060e8bedc1e3ccb07b2d99d03ab2b80
parentea6dc997668df98c0a553d677cf22850b476e412
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>
src/common/admin_socket.cc
src/common/admin_socket_client.cc
src/common/admin_socket_client.h
src/test/admin_socket.cc