no override by shutdown/pause

Author: hx235

db/compaction/compaction_iterator.cc

@@ -1120,16 +1120,16 @@ void CompactionIterator::NextFromInput() {
     }
   }
 
-  if (!Valid() && IsShuttingDown()) {
+  if (!Valid() && status_.ok() && IsShuttingDown()) {
     status_ = Status::ShutdownInProgress();
   }
 
-  if (IsPausingManualCompaction()) {
+  if (status_.ok() && IsPausingManualCompaction()) {
     status_ = Status::Incomplete(Status::SubCode::kManualCompactionPaused);
   }
 
   // Propagate corruption status from memtable itereator
-  if (!input_.Valid() && input_.status().IsCorruption()) {
+  if (status_.ok() && !input_.Valid() && input_.status().IsCorruption()) {
     status_ = input_.status();
   }
 }

db/compaction/compaction_job.cc

@@ -1610,11 +1610,10 @@ Status CompactionJob::FinalizeProcessKeyValueStatus(
     status =
         Status::ColumnFamilyDropped("Column family dropped during compaction");
   }
-  if ((status.ok() || status.IsColumnFamilyDropped()) &&
-      shutting_down_->load(std::memory_order_relaxed)) {
+  if (status.ok() && shutting_down_->load(std::memory_order_relaxed)) {
     status = Status::ShutdownInProgress("Database shutdown");
   }
-  if ((status.ok() || status.IsColumnFamilyDropped()) &&
+  if (status.ok() &&
       (manual_compaction_canceled_.load(std::memory_order_relaxed))) {
     status = Status::Incomplete(Status::SubCode::kManualCompactionPaused);
   }