Merge remote-tracking branch 'gh/master' into wip-cache

Conflicts:
	src/osdc/Objecter.h
	src/vstart.sh

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/common/ceph_strings.cc
Simple merge

diff --cc src/include/rados.h
Simple merge

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
index e02044653dee175ae61354526c8dbd379a0f7ddc,e68e7f0563ec42dae7dfba25fa861110a63f8aa7..8334476ca894c2a5fe5a9e261134957d6e90b271
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -4550,8 -4298,9 +4578,9 @@@ void ReplicatedPG::finish_ctx(OpContex
    // apply new object state.
    ctx->obc->obs = ctx->new_obs;
    ctx->obc->ssc->snapset = ctx->new_snapset;
 -  info.stats.stats.add(ctx->delta_stats, ctx->obc->obs.oi.category);
 +  info.stats.stats.add(ctx->delta_stats, ctx->obs->oi.category);
  
+   int backfill_target = get_backfill_target();
    if (backfill_target >= 0) {
      pg_info_t& pinfo = peer_info[backfill_target];
      if (soid <= pinfo.last_backfill)

diff --cc src/osd/ReplicatedPG.h
index d8d97deb7a2b46cbdb47cf4c094621e6d7fe31ee,337d45ff7d5c0e4002f1d1dcdc6f2f16ac0224a8..46f09649c51c956e0936876ba7a52c02919b70ce
--- 1/src/osd/ReplicatedPG.h
--- 2/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@@ -962,19 -945,8 +960,19 @@@ protected
    void cancel_copy(CopyOpRef cop, bool requeue);
    void cancel_copy_ops(bool requeue);
  
-   friend class C_Copyfrom;
+   friend struct C_Copyfrom;
  
 +  // -- flush --
 +  map<hobject_t, FlushOpRef> flush_ops;
 +
 +  int start_flush(OpContext *ctx, bool blocking);
 +  void finish_flush(hobject_t oid, tid_t tid, int r);
 +  int try_flush_mark_clean(FlushOpRef fop);
 +  void cancel_flush(FlushOpRef fop, bool requeue);
 +  void cancel_flush_ops(bool requeue);
 +
 +  friend class C_Flush;
 +
    // -- scrub --
    virtual void _scrub(ScrubMap& map);
    virtual void _scrub_clear_state();

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/osdc/Objecter.h
index 301811e77936943589ee473a093a67513958b9e8,16867a45ea4df1cccf4384fcea1f3c648976bc92..228a744b0cb95a8ae8903b9ea7ade656135fdf3e
--- 1/src/osdc/Objecter.h
--- 2/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@@ -1457,7 -1417,11 +1458,8 @@@ public
    void set_honor_osdmap_full() { honor_osdmap_full = true; }
    void unset_honor_osdmap_full() { honor_osdmap_full = false; }
  
-   void scan_requests(bool skipped_map,
 -  void set_honor_cache_redirects() { honor_cache_redirects = true; }
 -  void unset_honor_cache_redirects() { honor_cache_redirects = false; }
 -
+   void scan_requests(bool force_resend,
+                    bool force_resend_writes,
                     map<tid_t, Op*>& need_resend,
                     list<LingerOp*>& need_resend_linger,
                     map<tid_t, CommandOp*>& need_resend_command);

diff --cc src/test/librados/tier.cc
Simple merge

diff --cc src/tools/rados/rados.cc
Simple merge

diff --cc src/vstart.sh
index 3e270552bb35c02ad773f9127f88556d4b61b824,72ad3da33f7f964b673fd556b6fcc98ed5909ab1..b79d7c1ad0f41ed5bb796f67ddd5e8a0bc00e650
--- 1/src/vstart.sh
--- 2/src/vstart.sh
+++ b/src/vstart.sh
@@@ -37,7 -38,7 +38,8 @@@ smallmds=
  hitset=""
  overwrite_conf=1
  cephx=1 #turn cephx on by default
 +cache=""
+ memstore=0
  
  MON_ADDR=""