]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "rgw: simplify unblocked by stack state change"
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 29 Sep 2015 21:45:52 +0000 (14:45 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:12:55 +0000 (16:12 -0800)
This reverts commit 8509ef5034818e163bebc8fd2de039a96b4a8f1a.

src/rgw/rgw_coroutine.cc

index ae5a2cd9d696becbfa305afea4e6efc8d50a6f87..517dc78a3dd23f7f77975f8c330d12d46fe00e9b 100644 (file)
@@ -344,7 +344,11 @@ int RGWCoroutinesManager::run(list<RGWCoroutinesStack *>& stacks)
       RGWCoroutinesStack *s;
       while (stack->unblock_stack(&s)) {
        if (!s->is_blocked_by_stack() && !s->is_done()) {
-          s->schedule();
+         if (s->is_io_blocked()) {
+           blocked_count++;
+         } else {
+           s->schedule();
+         }
        }
       }
       if (stack->parent && stack->parent->waiting_for_child()) {