From: Sage Weil <sage@newdream.net>
Date: Tue, 14 Feb 2012 22:01:22 +0000 (-0800)
Subject: Merge branch 'wip-osd-hb'
X-Git-Tag: v0.43~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d19e735c18340d6a4e520a4777ef3f3bbae97cb;p=ceph.git

Merge branch 'wip-osd-hb'

Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
---

8d19e735c18340d6a4e520a4777ef3f3bbae97cb
diff --cc src/osd/PG.h
index a8976991732c,5632af5d246e..5ea380e1f021
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -1237,8 -1245,8 +1246,9 @@@ public
      role(0),
      state(0),
      need_up_thru(false),
 +    need_flush(false),
      last_peering_reset(0),
+     heartbeat_peer_lock("PG::heartbeat_peer_lock"),
      backfill_target(-1),
      pg_stats_lock("PG::pg_stats_lock"),
      pg_stats_valid(false),
@@@ -1294,9 -1302,10 +1304,12 @@@
  
    bool  is_empty() const { return info.last_update == eversion_t(0,0); }
  
+   void init(int role, vector<int>& up, vector<int>& acting, pg_history_t& history,
+ 	    ObjectStore::Transaction *t);
+ 
    // pg on-disk state
 +  void do_pending_flush();
 +
    void write_info(ObjectStore::Transaction& t);
    void write_log(ObjectStore::Transaction& t);