From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 9 Oct 2019 20:26:37 +0000 (-0400)
Subject: mds: don't warn when inodes are not allocated out sequentially
X-Git-Tag: v15.1.0~128^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e498df5c277ff374be7770f539373989719bc55;p=ceph.git

mds: don't warn when inodes are not allocated out sequentially

In the future, we may be allocating from different inode number sets
in the same session. Drop this check.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 43edb20c9010..3b0c7fe255d3 100644
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -172,11 +172,6 @@ public:
     return session_cache_liveness.get();
   }
 
-  inodeno_t next_ino() const {
-    if (info.prealloc_inos.empty())
-      return 0;
-    return info.prealloc_inos.range_start();
-  }
   inodeno_t take_ino(inodeno_t ino = 0) {
     ceph_assert(!info.prealloc_inos.empty());
 
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 6b4c798b4c59..bccef4f08fb1 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1496,11 +1496,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDSlaveUpdate *slaveup)
 	dout(20) << " (session prealloc " << session->info.prealloc_inos << ")" << dendl;
 	if (used_preallocated_ino) {
 	  if (!session->info.prealloc_inos.empty()) {
-	    inodeno_t next = session->next_ino();
 	    inodeno_t i = session->take_ino(used_preallocated_ino);
-	    if (next != i)
-	      mds->clog->warn() << " replayed op " << client_reqs << " used ino " << i
-			       << " but session next is " << next;
 	    ceph_assert(i == used_preallocated_ino);
 	    session->info.used_inos.clear();
 	  }