diff options
| author | Sage Weil <sage@newdream.net> | 2012-03-02 10:06:56 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-03-03 15:32:32 -0800 |
| commit | 186b7e10b91c4f06e66e7ded820acde254e00974 (patch) | |
| tree | 4b72c31838bdc3cc7e17b7d9f6f735a8c97d276a | |
| parent | cd313885783a5a69a554139b5b41d21a666c815b (diff) | |
| download | ceph-186b7e10b91c4f06e66e7ded820acde254e00974.tar.gz | |
Revert "filestore: wait to start op if other ops are in line"
This reverts commit 93d7ef96316f30d3d7caefe07a5a747ce883ca2d.
| -rw-r--r-- | src/os/JournalingObjectStore.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc index 71c96e1c8d6..b54b33cd969 100644 --- a/src/os/JournalingObjectStore.cc +++ b/src/os/JournalingObjectStore.cc @@ -124,9 +124,7 @@ uint64_t JournalingObjectStore::_op_apply_start(uint64_t op) { assert(journal_lock.is_locked()); - // if we ops are blocked, or there are already people (left) in - // line, get in line. - if (blocked || !ops_apply_blocked.empty()) { + if (blocked) { Cond cond; ops_apply_blocked.push_back(&cond); dout(10) << "op_apply_start " << op << " blocked (getting in back of line)" << dendl; |