Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4044 from influxdata/dom/compactor-shutdown 

fix: propagate shutdown into CompactorHandler
pull/24376/head
kodiakhq[bot] 2022-03-15 17:40:00 +00:00 committed by GitHub
parent b48f8ca6f9 026b415eea
commit 943cc3731c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
influxdb_ioxd/src/server_type/compactor.rs
View File

@ -15,7 +15,6 @@ use metric::Registry;
use object_store::DynObjectStore; use object_store::DynObjectStore;
use query::exec::Executor; use query::exec::Executor;
use time::TimeProvider; use time::TimeProvider;
use tokio_util::sync::CancellationToken;
use trace::TraceCollector; use trace::TraceCollector;
use crate::{ use crate::{
@ -27,7 +26,6 @@ use crate::{
#[derive(Debug)] #[derive(Debug)]
pub struct CompactorServerType<C: CompactorHandler> { pub struct CompactorServerType<C: CompactorHandler> {
server: CompactorServer<C>, server: CompactorServer<C>,
shutdown: CancellationToken,
trace_collector: Option<Arc<dyn TraceCollector>>, trace_collector: Option<Arc<dyn TraceCollector>>,
} }
@ -35,7 +33,6 @@ impl<C: CompactorHandler> CompactorServerType<C> {
pub fn new(server: CompactorServer<C>, common_state: &CommonServerState) -> Self { pub fn new(server: CompactorServer<C>, common_state: &CommonServerState) -> Self {
Self { Self {
server, server,
shutdown: CancellationToken::new(),
trace_collector: common_state.trace_collector(), trace_collector: common_state.trace_collector(),
} }
} }
@ -71,11 +68,11 @@ impl<C: CompactorHandler + std::fmt::Debug + 'static> ServerType for CompactorSe
} }
async fn join(self: Arc<Self>) { async fn join(self: Arc<Self>) {
self.shutdown.cancelled().await; self.server.join().await;
} }
fn shutdown(&self) { fn shutdown(&self) {
self.shutdown.cancel(); self.server.shutdown();
} }
} }