From 8a97eef1f7004988449bd7ace4c69d5796495139 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 23 Jan 2013 12:49:04 -0800 Subject: [PATCH] ReplicatedPG: handle omap > max_recovery_chunk span_of fails if len == 0. Backport: bobtail Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 80eec2e16fc08..7afa364af13ca 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -5577,9 +5577,13 @@ int ReplicatedPG::send_push(int prio, int peer, new_progress.omap_recovered_to = iter->key(); } - subop->data_included.span_of(recovery_info.copy_subset, - progress.data_recovered_to, - available); + if (available > 0) { + subop->data_included.span_of(recovery_info.copy_subset, + progress.data_recovered_to, + available); + } else { + subop->data_included.clear(); + } for (interval_set::iterator p = subop->data_included.begin(); p != subop->data_included.end(); -- 2.39.5