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 43edb20c9010c83bd80ae0548dddefce0ddd11f0..3b0c7fe255d3cce288f5b6746b8bff5f55a90b1e 100644 (file)
--- 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 6b4c798b4c59c10f9e87cceb5bcea524cff2a1b1..bccef4f08fb165579c1ca3538ffe4f5cb566124b 100644 (file)
--- 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();
          }