From: Sage Weil Date: Tue, 22 Sep 2009 16:59:23 +0000 (-0700) Subject: monclient: change pick_new_mon -> reopen_session X-Git-Tag: v0.15~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48866c2f94de196834540d1d502554ddc7182202;p=ceph.git monclient: change pick_new_mon -> reopen_session --- diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index dcde7ecb964..c44182c5b53 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -157,9 +157,9 @@ public: Mutex::Locker l(monc_lock); monmap.last_mon = m; } - void pick_new_mon() { + void reopen_session() { Mutex::Locker l(monc_lock); - _pick_new_mon(); + _reopen_session(); } entity_addr_t get_my_addr() { return my_addr; } diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 023d3b4511e..0094e545658 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1229,7 +1229,7 @@ void OSD::do_mon_report() pg_stat_queue_lock.Unlock(); if (retry) { - monc->pick_new_mon(); + monc->reopen_session(); dout(10) << "picked a new mon" << dendl; }