From: John Spray <john.spray@redhat.com>
Date: Wed, 1 Oct 2014 22:00:35 +0000 (+0100)
Subject: osdc/Objecter: respect honor_osdmap_full setting
X-Git-Tag: v0.91~47^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12808b9e2ad209e6f5925d8fa49a41d1cb073c7b;p=ceph.git

osdc/Objecter: respect honor_osdmap_full setting

With this, it no longer needs to special case the MDS,
as the MDS can just call unset_honor_osdmap_full.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 2e832ff5178f5..5ad65d488853f 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1986,9 +1986,8 @@ bool Objecter::target_should_be_paused(op_target_t *t)
  */
 bool Objecter::osdmap_full_flag() const
 {
-  // Ignore the FULL flag if we are working on behalf of an MDS, in order to permit
-  // MDS journal writes for file deletions.
-  return osdmap->test_flag(CEPH_OSDMAP_FULL) && (messenger->get_myname().type() != entity_name_t::TYPE_MDS);
+  // Ignore the FULL flag if the caller has honor_osdmap_full
+  return osdmap->test_flag(CEPH_OSDMAP_FULL) && honor_osdmap_full;
 }