]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: transpose two wait lists in comment 27017/head
authorKefu Chai <kchai@redhat.com>
Sun, 17 Mar 2019 07:21:14 +0000 (15:21 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 17 Mar 2019 08:36:47 +0000 (16:36 +0800)
commit253b8734c12b3f39701935b035af48b0e0489568
treeba6c55415766fdc70b6ea8b9185ba41656b21b85
parent51b1cacc2a7fcbe1dcf1929c4902a7eaaf07ec4f
osd: transpose two wait lists in comment

see PrimaryLogPG::do_request(), we check for

1. is_peered(), then
2. flushes_in_progress, then
3. is_active()
4. scrubber.is_chunky_scrub_active() && write_blocked_by_scrub(head) in
   PrimaryLogPG::do_op() which is called by PrimaryLogPG::do_request().

while in PrimaryLogPG::on_change()

we requeue the waiting request in the reversed order,

1. requeue_ops(waiting_for_peered);
2. requeue_ops(waiting_for_flush);
3. requeue_ops(waiting_for_active);

so the comment is not in sync with the code. in this change,
"waiting_for_active" and "waiting_for_flush" are transposed in the
comment explaining blocked request wait lists.

also, sync the pre-conditions of "waiting_for_peered" and
"waiting_for_flush" with "PrimaryLogPG::do_request()"

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/osd/PG.h