|
@@ -1423,7 +1423,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
|
|
|
struct ceph_osds up, acting;
|
|
struct ceph_osds up, acting;
|
|
|
bool force_resend = false;
|
|
bool force_resend = false;
|
|
|
bool unpaused = false;
|
|
bool unpaused = false;
|
|
|
- bool legacy_change;
|
|
|
|
|
|
|
+ bool legacy_change = false;
|
|
|
bool split = false;
|
|
bool split = false;
|
|
|
bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);
|
|
bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);
|
|
|
bool recovery_deletes = ceph_osdmap_flag(osdc,
|
|
bool recovery_deletes = ceph_osdmap_flag(osdc,
|
|
@@ -1511,15 +1511,14 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
|
|
|
t->osd = acting.primary;
|
|
t->osd = acting.primary;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (unpaused || legacy_change || force_resend ||
|
|
|
|
|
- (split && con && CEPH_HAVE_FEATURE(con->peer_features,
|
|
|
|
|
- RESEND_ON_SPLIT)))
|
|
|
|
|
|
|
+ if (unpaused || legacy_change || force_resend || split)
|
|
|
ct_res = CALC_TARGET_NEED_RESEND;
|
|
ct_res = CALC_TARGET_NEED_RESEND;
|
|
|
else
|
|
else
|
|
|
ct_res = CALC_TARGET_NO_ACTION;
|
|
ct_res = CALC_TARGET_NO_ACTION;
|
|
|
|
|
|
|
|
out:
|
|
out:
|
|
|
- dout("%s t %p -> ct_res %d osd %d\n", __func__, t, ct_res, t->osd);
|
|
|
|
|
|
|
+ dout("%s t %p -> %d%d%d%d ct_res %d osd%d\n", __func__, t, unpaused,
|
|
|
|
|
+ legacy_change, force_resend, split, ct_res, t->osd);
|
|
|
return ct_res;
|
|
return ct_res;
|
|
|
}
|
|
}
|
|
|
|
|
|