From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Sep 2016 18:29:58 +0000 (-0400)
Subject: os/bluestore/BlueFS: only extend extent on same bdev
X-Git-Tag: v11.0.1~286^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11023%2Fhead;p=ceph.git

os/bluestore/BlueFS: only extend extent on same bdev

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index ffb429b4c22..5ad740abfe2 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -1688,7 +1688,9 @@ int BlueFS::_allocate(uint8_t id, uint64_t len, vector<bluefs_extent_t> *ev)
   }
   for (int i = 0; i < count; i++) {
     bluefs_extent_t e = bluefs_extent_t(id, extents[i].offset, extents[i].length);
-    if (!ev->empty() && ev->back().end() == (uint64_t) e.offset) {
+    if (!ev->empty() &&
+	ev->back().bdev == e.bdev &&
+	ev->back().end() == (uint64_t) e.offset) {
       ev->back().length += e.length;
     } else {
       ev->push_back(e);