update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / cephfs / MDSUtility.cc

diff --git a/ceph/src/tools/cephfs/MDSUtility.cc b/ceph/src/tools/cephfs/MDSUtility.cc
index 80ce3c34934ebb91140cb2e969215986ad5ccc93..7e7da209bb6a5853ee5ce65e9d618429fc9dcc0c 100644 (file)
--- a/ceph/src/tools/cephfs/MDSUtility.cc
+++ b/ceph/src/tools/cephfs/MDSUtility.cc
@@ -42,14 +42,14 @@ MDSUtility::~MDSUtility()
   delete monc;
   delete messenger;
   delete fsmap;
-  assert(waiting_for_mds_map == NULL);
+  ceph_assert(waiting_for_mds_map == NULL);
 }
 
 
 int MDSUtility::init()
 {
   // Initialize Messenger
-  int r = messenger->bind(g_conf->public_addr);
+  int r = messenger->bind(g_conf()->public_addr);
   if (r < 0)
     return r;
 
@@ -94,7 +94,7 @@ int MDSUtility::init()
   Mutex init_lock("MDSUtility:init");
   Cond cond;
   bool done = false;
-  assert(!fsmap->get_epoch());
+  ceph_assert(!fsmap->get_epoch());
   lock.Lock();
   waiting_for_mds_map = new C_SafeCond(&init_lock, &cond, &done, NULL);
   lock.Unlock();
@@ -156,17 +156,11 @@ void MDSUtility::handle_fs_map(MFSMap* m)
 }
 
 
-bool MDSUtility::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
-                         bool force_new)
+bool MDSUtility::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer)
 {
   if (dest_type == CEPH_ENTITY_TYPE_MON)
     return true;
 
-  if (force_new) {
-    if (monc->wait_auth_rotating(10) < 0)
-      return false;
-  }
-
   *authorizer = monc->build_authorizer(dest_type);
   return *authorizer != NULL;
 }