Deal with iter errors

Signed-off-by: v01dstar <[email protected]>

Author: v01dstar

src/blob_gc_job.cc

@@ -221,6 +221,9 @@ Status BlobGCJob::HolePunchSingleBlobFile(std::shared_ptr<BlobFileMeta> file) {
     return Status::NotSupported("Hole punch not supported");
 #endif
   }
+  if (!iter->status().ok()) {
+    return iter->status();
+  }
   hole_punched_files_map_[file->file_number()] = live_blocks;
   return Status::OK();
 }
@@ -467,7 +470,7 @@ Status BlobGCJob::DiscardEntry(const Slice& key, const BlobIndex& blob_index,
 // added to db before we rewrite any key to LSM
 Status BlobGCJob::Finish() {
   Status s;
-  {
+  if (!blob_gc_->use_punch_hole()) {
     mutex_->Unlock();
     s = InstallOutputBlobFiles();
     if (s.ok()) {
@@ -486,8 +489,12 @@ Status BlobGCJob::Finish() {
                       s.ToString().c_str());
     }
     mutex_->Lock();
-  }
-  if (blob_gc_->use_punch_hole()) {
+    if (s.ok() && !blob_gc_->GetColumnFamilyData()->IsDropped()) {
+      TEST_SYNC_POINT("BlobGCJob::Finish::BeforeDeleteInputBlobFiles");
+      s = DeleteInputBlobFiles();
+    }
+    TEST_SYNC_POINT("BlobGCJob::Finish::AfterRewriteValidKeyToLSM");
+  } else {
     TITAN_LOG_INFO(db_options_.info_log,
                    "Titan GC job finished, before batch updates");
     // It is possible that while processing the GC job, the input blob files'
@@ -515,13 +522,6 @@ Status BlobGCJob::Finish() {
       s = blob_file_manager_->BatchUpdateFiles(hole_punched_files);
     }
   }
-  if (s.ok() && !blob_gc_->GetColumnFamilyData()->IsDropped() &&
-      !blob_gc_->use_punch_hole()) {
-    TEST_SYNC_POINT("BlobGCJob::Finish::BeforeDeleteInputBlobFiles");
-    s = DeleteInputBlobFiles();
-  }
-  TEST_SYNC_POINT("BlobGCJob::Finish::AfterRewriteValidKeyToLSM");
-
   if (s.ok()) {
     UpdateInternalOpStats();
   }