Revert "osdc: After write try merge bh." #11262
Conversation
This reverts commit 1a48a8a. Fixes: http://tracker.ceph.com/issues/17270 Signed-off-by: John Spray <john.spray@redhat.com>
|
lgtm |
|
Can you please explain in the commit and/or ticket why it's bad? At first blush we certainly do want to merge bufferheads whenever possible... |
|
@gregsfortytwo This loop [1] operates on bhs that might be merged together. e.g. if the first and second bhs can be merged, they will -- then the loop will advance to the now merged/destructed second bh and try to merge it. [1] https://github.com/ceph/ceph/pull/11262/files#diff-9bcd2f7647a2bd574b6ebe6baf8e61b3L1166 |
|
Right, makes sense. We still want to do the merging though so we probably need a better data structure/algorithm instead of just tossing it out. |
|
Testing http://pulpito.ceph.com/gregf-2016-10-06_18:07:58-fs-greg-fs-testing-105---basic-mira/ looks pretty good; OSD failure (http://tracker.ceph.com/issues/17553), pjd failure due to missing qa-suite wip-getuid merge, 2xlibcephfs-java failures (http://tracker.ceph.com/issues/17548), 1 dead job. I'd still prefer we do a better job merging though. |
|
@gregsfortytwo you're right that we should add the behaviour back, but for the moment this needs to merge because the current code crashes. I've created http://tracker.ceph.com/issues/17589 for the job of adding it back |
This reverts commit 1a48a8a.
Fixes: http://tracker.ceph.com/issues/17270
Signed-off-by: John Spray john.spray@redhat.com