drop spanning thing

ceph · Jan 27, 2017 · a3e3ffc · a3e3ffc
1 parent 1649efd
commit a3e3ffc
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
@@ -1940,10 +1940,6 @@ void BlueStore::ExtentMap::reshard(
   dout(20) << __func__ << "  extent_avg " << extent_avg << ", target " << target
 	   << ", slop " << slop << dendl;
 
-  // interval to scan for spanning blobs
-  unsigned spanning_scan_begin = needs_reshard_begin;
-  unsigned spanning_scan_end = needs_reshard_end;
-
   // reshard
   unsigned estimate = 0;
   unsigned offset = 0;
@@ -1960,12 +1956,6 @@ void BlueStore::ExtentMap::reshard(
 
     // unspan spanning blobs
     if (e->blob->is_spanning()) {
-      if (e->blob_start() < spanning_scan_begin) {
-	spanning_scan_begin = e->blob_start();
-      }
-      if (e->blob_end() > spanning_scan_end) {
-	spanning_scan_end = e->blob_end();
-      }
       spanning_blob_map.erase(e->blob->id);
       e->blob->id = -1;
       dout(30) << __func__ << " un-spanning " << *e->blob << dendl;
@@ -2039,9 +2029,7 @@ void BlueStore::ExtentMap::reshard(
 
   // identify spanning blobs
   if (!sv.empty()) {
-    dout(20) << __func__ << " checking for spanning blobs on 0x[" << std::hex
-	     << spanning_scan_begin << "," << spanning_scan_end << ")"
-	     << std::dec << dendl;
+    dout(20) << __func__ << " checking for spanning blobs" << dendl;
     auto sp = sv.begin() + si_begin;
     auto esp = sv.end();
     unsigned shard_start = 0;
@@ -2058,9 +2046,9 @@ void BlueStore::ExtentMap::reshard(
     } else {
       bid = spanning_blob_map.rend()->first + 1;
     }
-    Extent dummy(spanning_scan_begin);
+    Extent dummy(needs_reshard_begin);
     for (auto e = extent_map.lower_bound(dummy); e != extent_map.end(); ++e) {
-      if (e->logical_offset >= spanning_scan_end) {
+      if (e->logical_offset >= needs_reshard_end) {
 	break;
       }
       dout(30) << " extent " << *e << dendl;