]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: consolidate extents from the same device only 31644/head
authorIgor Fedotov <ifedotov@suse.com>
Wed, 13 Nov 2019 19:09:53 +0000 (22:09 +0300)
committerSage Weil <sage@redhat.com>
Thu, 14 Nov 2019 16:32:09 +0000 (10:32 -0600)
Presumably Fixes: https://tracker.ceph.com/issues/42223

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 20a90698a262905e97bae771b5950af04c00c67a)

src/os/bluestore/bluefs_types.h

index 9c8511711b38cdf63ace36e09ca7bc0aa03eea8c..2e5b97f75c59246ed5a9a3b44f1c52c937bb2469 100644 (file)
@@ -90,6 +90,7 @@ struct bluefs_fnode_t {
   void append_extent(const bluefs_extent_t& ext) {
     if (!extents.empty() &&
        extents.back().end() == ext.offset &&
+       extents.back().bdev == ext.bdev &&
        (uint64_t)extents.back().length + (uint64_t)ext.length < 0xffffffff) {
       extents.back().length += ext.length;
     } else {