From: Sage Weil <sage@inktank.com>
Date: Tue, 8 Jul 2014 18:45:22 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~135
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7756a136d25458aaa6336c86e6f71d98b31886ff;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

7756a136d25458aaa6336c86e6f71d98b31886ff
diff --cc src/osd/OSD.cc
index f6055dbdfd64d,597678722e6aa..0a3ecc33234cd
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -1896,7 -1888,9 +1902,8 @@@ PG *OSD::_open_lock_pg
      pg_map[pgid] = pg;
      pg->get("PGMap");  // because it's in pg_map
      service.pg_add_epoch(pg->info.pgid, createmap->get_epoch());
+     wake_pg_waiters(pg, pgid);
    }
 -  wake_pg_waiters(pg, pgid);
    return pg;
  }
  
@@@ -3708,10 -3693,10 +3710,10 @@@ void OSD::ms_handle_fast_connect(Connec
    if (con->get_peer_type() != CEPH_ENTITY_TYPE_MON) {
      Session *s = static_cast<Session*>(con->get_priv());
      if (!s) {
 -      s = new Session;
 +      s = new Session(cct);
        con->set_priv(s->get());
        s->con = con;
-       dout(10) << " new session (outgoing)" << s << " con=" << s->con
+       dout(10) << " new session (outgoing) " << s << " con=" << s->con
            << " addr=" << s->con->get_peer_addr() << dendl;
        // we don't connect to clients
        assert(con->get_peer_type() == CEPH_ENTITY_TYPE_OSD);