From 1d724db8a633e6270cd89b8962b22bb40598baca Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 8 Jan 2009 12:15:19 -0800 Subject: [PATCH] mds: fix sessionmap->version value during EMetaBlob replay ++v, not v++. --- src/mds/Server.cc | 3 ++- src/mds/journal.cc | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 95fad91eede31..78577d1704cc2 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -1397,7 +1397,8 @@ CInode* Server::prepare_new_inode(MDRequest *mdr, CDir *dir, inodeno_t useino) void Server::journal_allocated_inos(MDRequest *mdr, EMetaBlob *blob) { - dout(20) << "journal_allocated_inos" << dendl; + dout(20) << "journal_allocated_inos sessionmapv " << mds->sessionmap.projected + << " inotablev " << mds->inotable->get_projected_version() << dendl; blob->set_ino_alloc(mdr->alloc_ino, mdr->used_prealloc_ino, mdr->prealloc_inos, diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 4dc0b80c6b1b6..85c5b05d890fa 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -524,7 +524,7 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg) << " <= table " << mds->sessionmap.version << dendl; } else { dout(10) << " EMetaBlob.replay sessionmap v" << sessionmapv - << " -1 == table " << mds->sessionmap.version + << " -(1|2) == table " << mds->sessionmap.version << " prealloc " << preallocated_inos << " used " << used_preallocated_ino << dendl; @@ -534,13 +534,13 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg) inodeno_t i = session->take_ino(); assert(i == used_preallocated_ino); session->used_inos.clear(); - mds->sessionmap.projected = mds->sessionmap.version++; + mds->sessionmap.projected = ++mds->sessionmap.version; } if (preallocated_inos.size()) { session->prealloc_inos.insert(session->prealloc_inos.end(), preallocated_inos.begin(), preallocated_inos.end()); - mds->sessionmap.projected = mds->sessionmap.version++; + mds->sessionmap.projected = ++mds->sessionmap.version; } assert(sessionmapv == mds->sessionmap.version); } -- 2.39.5