From: Loic Dachary <loic@dachary.org>
Date: Thu, 4 Feb 2016 04:16:35 +0000 (+0700)
Subject: Merge pull request #6268 from dachary/wip-13453-recovery-counters
X-Git-Tag: v10.0.4~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b04e17687fcb4609a8c6c3623bd0786116733465;p=ceph.git

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

recovery counters

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

b04e17687fcb4609a8c6c3623bd0786116733465
diff --cc src/osd/ECBackend.cc
index 6d5f0f1bd488,c4381b689149..feefcd7dc273
--- a/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());