From 7c048c806dfa31314ca3a9df40b1b3a581d90bac Mon Sep 17 00:00:00 2001 From: sageweil Date: Tue, 15 May 2007 21:07:03 +0000 Subject: [PATCH] * fixed client_inc bug w/ fakesyn git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1357 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/cephmds2/client/Client.cc | 6 ++---- branches/sage/cephmds2/osdc/Objecter.cc | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/branches/sage/cephmds2/client/Client.cc b/branches/sage/cephmds2/client/Client.cc index bcf763ce6e162..00874d206a4b8 100644 --- a/branches/sage/cephmds2/client/Client.cc +++ b/branches/sage/cephmds2/client/Client.cc @@ -123,6 +123,7 @@ Client::Client(Messenger *m, MonMap *mm) // osd interfaces osdmap = new OSDMap(); // initially blank.. see mount() objecter = new Objecter(messenger, monmap, osdmap); + objecter->set_client_incarnation(0); // client always 0, for now. objectcacher = new ObjectCacher(objecter, client_lock); filer = new Filer(objecter); } @@ -873,7 +874,7 @@ void Client::handle_mds_map(MMDSMap* m) if (m->get_source().is_mds()) frommds = m->get_source().num(); - if (mdsmap == 0) + if (mdsmap == 0) mdsmap = new MDSMap; if (whoami < 0) { @@ -883,9 +884,6 @@ void Client::handle_mds_map(MMDSMap* m) dout(1) << "handle_mds_map i am now " << m->get_dest() << endl; messenger->reset_myname(m->get_dest()); - // note our inc # - objecter->set_client_incarnation(0); // client always 0, for now. - mount_cond.Signal(); // mount might be waiting for this. } diff --git a/branches/sage/cephmds2/osdc/Objecter.cc b/branches/sage/cephmds2/osdc/Objecter.cc index 29fa186e274f1..edbc2d741f66f 100644 --- a/branches/sage/cephmds2/osdc/Objecter.cc +++ b/branches/sage/cephmds2/osdc/Objecter.cc @@ -656,6 +656,7 @@ tid_t Objecter::modifyx_submit(OSDModify *wr, ObjectExtent &ex, tid_t usetid) tid = usetid; else tid = ++last_tid; + assert(client_inc >= 0); // add to gather set wr->waitfor_ack[tid] = ex; -- 2.39.5