]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore/segment_cleaner.cc: adjust whitespace in init_segments()
authorSamuel Just <sjust@redhat.com>
Thu, 7 Oct 2021 23:41:07 +0000 (16:41 -0700)
committerXuehan Xu <xxhdx1985126@gmail.com>
Sun, 10 Oct 2021 06:22:10 +0000 (14:22 +0800)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/crimson/os/seastore/segment_cleaner.cc

index 672e4af010f891a3b4af8b10f848400e51134cf1..c68a97baf59ea0f1438efb4d611477893cc8faa6 100644 (file)
@@ -419,35 +419,40 @@ SegmentCleaner::init_segments_ret SegmentCleaner::init_segments() {
       segments.begin(),
       segments.end(),
       [this, &segment_set](auto& segment_info) {
-      auto segment_id = segment_info.segment;
-      return scanner->read_segment_header(segment_id)
-      .safe_then([&segment_set, segment_id, this](auto header) {
-       if (header.out_of_line) {
-         logger().debug("ExtentReader::init_segments: out-of-line segment {}", segment_id);
-         init_mark_segment_closed(
-           segment_id,
-           header.journal_segment_seq,
-           true);
-       } else {
-         logger().debug("ExtentReader::init_segments: journal segment {}", segment_id);
-         segment_set.emplace_back(std::make_pair(segment_id, std::move(header)));
-       }
-       return seastar::now();
-      }).handle_error(
-       crimson::ct_error::enoent::handle([](auto) {
-         return init_segments_ertr::now();
-       }),
-       crimson::ct_error::enodata::handle([](auto) {
-         return init_segments_ertr::now();
-       }),
-       crimson::ct_error::input_output_error::pass_further{}
-      );
-    }).safe_then([&segment_set] {
-      return seastar::make_ready_future<
-       std::vector<std::pair<segment_id_t, segment_header_t>>>(
-         std::move(segment_set));
+       auto segment_id = segment_info.segment;
+       return scanner->read_segment_header(
+         segment_id
+       ).safe_then([&segment_set, segment_id, this](auto header) {
+         if (header.out_of_line) {
+           logger().debug(
+             "ExtentReader::init_segments: out-of-line segment {}",
+             segment_id);
+           init_mark_segment_closed(
+             segment_id,
+             header.journal_segment_seq,
+             true);
+         } else {
+           logger().debug(
+             "ExtentReader::init_segments: journal segment {}",
+             segment_id);
+           segment_set.emplace_back(std::make_pair(segment_id, std::move(header)));
+         }
+         return seastar::now();
+       }).handle_error(
+         crimson::ct_error::enoent::handle([](auto) {
+           return init_segments_ertr::now();
+         }),
+         crimson::ct_error::enodata::handle([](auto) {
+           return init_segments_ertr::now();
+         }),
+         crimson::ct_error::input_output_error::pass_further{}
+       );
+      }).safe_then([&segment_set] {
+       return seastar::make_ready_future<
+         std::vector<std::pair<segment_id_t, segment_header_t>>>(
+           std::move(segment_set));
+      });
     });
-  });
 }
 
 }