Merge pull request #107 from hicder/hieu_remote_compaction_shutting_down

igorcanadi · web-flow · commit bb84f4e16495 · 2021-02-08T17:54:37.000Z
Add shutting_down signal to remote compaction
diff --git a/db/compaction/compaction_job.cc b/db/compaction/compaction_job.cc
@@ -1764,6 +1764,7 @@ void CompactionJob::RunRemote(PluggableCompactionService* service) {
     }
     param.input_files.push_back(files_in_one_level);
   }
+  param.shutting_down = shutting_down_;
 
   // make the RPC
   status = service->Run(param, &result);
diff --git a/include/rocksdb/pluggable_compaction.h b/include/rocksdb/pluggable_compaction.h
@@ -39,6 +39,9 @@ class PluggableCompactionParam {
 
   // The level to which the files are compacted into
   int output_level;
+
+  // Control whether the DB is shutting down
+  const std::atomic<bool>* shutting_down;
 };
 
 //

Original file line number	Diff line number	Diff line change
`@@ -1764,6 +1764,7 @@ void CompactionJob::RunRemote(PluggableCompactionService* service) {`
`1764`	`1764`	`}`
`1765`	`1765`	`param.input_files.push_back(files_in_one_level);`
`1766`	`1766`	`}`
	`1767`	`+ param.shutting_down = shutting_down_;`
`1767`	`1768`
`1768`	`1769`	`// make the RPC`
`1769`	`1770`	`status = service->Run(param, &result);`