Merge pull request #6268 from dachary/wip-13453-recovery-counters

recovery counters

Reviewed-by: Samuel Just <sjust@redhat.com>

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

diff --cc src/osd/ECBackend.cc
index 6d5f0f1bd488364f9cc8461b1c11c68725583332,c4381b6891498521430e2a01572e08e10b8d1b60..feefcd7dc273dd98f22f504ea2cb962650ccb5a1
--- 1/src/osd/ECBackend.cc
--- 2/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@@ -306,22 -305,17 +306,17 @@@ void ECBackend::handle_recovery_push
      if ((get_parent()->pgb_is_primary())) {
        assert(recovery_ops.count(op.soid));
        assert(recovery_ops[op.soid].obc);
-       object_stat_sum_t stats;
-       stats.num_objects_recovered = 1;
-       stats.num_bytes_recovered = recovery_ops[op.soid].obc->obs.oi.size;
        get_parent()->on_local_recover(
        op.soid,
-       stats,
        op.recovery_info,
        recovery_ops[op.soid].obc,
 -      m->t);
 +      &m->t);
      } else {
        get_parent()->on_local_recover(
        op.soid,
-       object_stat_sum_t(),
        op.recovery_info,
        ObjectContextRef(),
 -      m->t);
 +      &m->t);
      }
    }
    m->push_replies[get_parent()->primary_shard()].push_back(PushReplyOp());

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

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

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

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