RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: improve debug log messages for managed lock

Browse Source 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2017-03-03 12:38:18 -05:00
parent 854a96f1da
commit 00591653bc
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librbd/ManagedLock.cc
View File

@ -19,7 +19,8 @@
#define dout_subsys ceph_subsys_rbd
#undef dout_prefix
#define dout_prefix *_dout << "librbd::ManagedLock: " << this << " " << __func__
#define dout_prefix *_dout << "librbd::ManagedLock: " << this << " " \
<< __func__
namespace librbd {
@ -663,7 +664,6 @@ void ManagedLock<I>::send_shutdown() {
return;
}
ldout(m_cct, 10) << dendl;
assert(m_state == STATE_LOCKED);
m_state = STATE_PRE_SHUTTING_DOWN;

3
src/librbd/managed_lock/AcquireRequest.cc
View File

@ -103,7 +103,8 @@ void AcquireRequest<I>::handle_get_locker(int r) {
template <typename I>
void AcquireRequest<I>::send_lock() {
ldout(m_cct, 10) << "cookie=" << m_cookie << dendl;
ldout(m_cct, 10) << "entity=client." << m_ioctx.get_instance_id() << ", "
<< "cookie=" << m_cookie << dendl;
librados::ObjectWriteOperation op;
rados::cls::lock::lock(&op, RBD_LOCK_NAME,

18
src/librbd/managed_lock/BreakRequest.cc
View File

@ -93,21 +93,25 @@ void BreakRequest<I>::handle_get_watchers(int r) {
return;
}
bool found_alive_locker = false;
for (auto &watcher : m_watchers) {
ldout(m_cct, 20) << "watcher=["
<< "addr=" << watcher.addr << ", "
<< "entity=client." << watcher.watcher_id << "]" << dendl;
if ((strncmp(m_locker.address.c_str(),
watcher.addr, sizeof(watcher.addr)) == 0) &&
(m_locker.handle == watcher.cookie)) {
ldout(m_cct, 10) << "lock owner is still alive" << dendl;
if (m_force_break_lock) {
break;
} else {
finish(-EAGAIN);
return;
}
found_alive_locker = true;
}
}
if (!m_force_break_lock && found_alive_locker) {
finish(-EAGAIN);
return;
}
send_blacklist();
}

3
src/librbd/managed_lock/BreakRequest.h
View File

@ -34,7 +34,8 @@ public:
uint32_t blacklist_expire_seconds,
bool force_break_lock, Context *on_finish) {
return new BreakRequest(ioctx, work_queue, oid, locker, blacklist_locker,
blacklist_expire_seconds, force_break_lock, on_finish);
blacklist_expire_seconds, force_break_lock,
on_finish);
}
void send();

3
src/librbd/managed_lock/ReleaseRequest.cc
View File

@ -55,7 +55,8 @@ void ReleaseRequest<I>::send() {
template <typename I>
void ReleaseRequest<I>::send_unlock() {
CephContext *cct = reinterpret_cast<CephContext *>(m_ioctx.cct());
ldout(cct, 10) << "cookie=" << m_cookie << dendl;
ldout(cct, 10) << "entity=client." << m_ioctx.get_instance_id() << ", "
<< "cookie=" << m_cookie << dendl;
librados::ObjectWriteOperation op;
rados::cls::lock::unlock(&op, RBD_LOCK_NAME, m_cookie);