From 56196669fe9017dc6f8e8ca860f3af7d4640cbed Mon Sep 17 00:00:00 2001 From: sage Date: Thu, 16 Feb 2006 22:57:39 +0000 Subject: [PATCH] avoid stupid pg_update startup flurry git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@647 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/osd/OSD.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc index 29dc942249395..56e5c8a724506 100644 --- a/ceph/osd/OSD.cc +++ b/ceph/osd/OSD.cc @@ -623,6 +623,7 @@ void OSD::update_map(bufferlist& state, bool mkfs) advance_map(pg_list); activate_map(pg_list); + /* if (mkfs) { // mark all peers complete for (list::iterator pgid = pg_list.begin(); @@ -639,7 +640,8 @@ void OSD::update_map(bufferlist& state, bool mkfs) MSG_ADDR_OSD(p->get_peer())); } } - } + }*/ + // process waiters take_waiters(waiting_for_osdmap); @@ -1277,6 +1279,10 @@ void OSD::handle_pg_peer(MOSDPGPeer *m) // i am now peered pg->state_set(PG_STATE_PEERED); pg->state_clear(PG_STATE_STRAY); + + if (m->get_version() == 1) { + pg->mark_complete( m->get_version() ); // it's a mkfs.. mark pg complete too + } dout(10) << "sending peer ack " << *pg << " " << ack->pg_state[pgid].objects.size() << " objects" << endl; } -- 2.39.5