refactor: remove query concurrency limit

influxdata · Dec 9, 2024 · 3b8f714 · 3b8f714
1 parent ef3599d
commit 3b8f714
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/influxdb3/src/commands/serve.rs b/influxdb3/src/commands/serve.rs
@@ -517,7 +517,6 @@ pub async fn command(config: Config) -> Result<()> {
         exec: Arc::clone(&exec),
         metrics: Arc::clone(&metrics),
         datafusion_config: Arc::new(config.datafusion_config),
-        concurrent_query_limit: 10,
         query_log_size: config.query_log_size,
         telemetry_store: Arc::clone(&telemetry_store),
         sys_events_store: Arc::clone(&sys_events_store),

diff --git a/influxdb3_server/src/lib.rs b/influxdb3_server/src/lib.rs
@@ -830,7 +830,6 @@ mod tests {
             exec: Arc::clone(&exec),
             metrics: Arc::clone(&metrics),
             datafusion_config: Default::default(),
-            concurrent_query_limit: 10,
             query_log_size: 10,
             telemetry_store: Arc::clone(&sample_telem_store),
             sys_events_store: Arc::clone(&sys_events_store),

diff --git a/influxdb3_server/src/query_executor.rs b/influxdb3_server/src/query_executor.rs
@@ -41,6 +41,7 @@ use std::any::Any;
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::sync::Arc;
+use tokio::sync::Semaphore;
 use trace::ctx::SpanContext;
 use trace::span::{Span, SpanExt, SpanRecorder};
 use trace_http::ctx::RequestLogContext;
@@ -68,7 +69,6 @@ pub struct CreateQueryExecutorArgs {
     pub exec: Arc<Executor>,
     pub metrics: Arc<Registry>,
     pub datafusion_config: Arc<HashMap<String, String>>,
-    pub concurrent_query_limit: usize,
     pub query_log_size: usize,
     pub telemetry_store: Arc<TelemetryStore>,
     pub sys_events_store: Arc<SysEventStore>,
@@ -82,7 +82,6 @@ impl QueryExecutorImpl {
             exec,
             metrics,
             datafusion_config,
-            concurrent_query_limit,
             query_log_size,
             telemetry_store,
             sys_events_store,
@@ -93,7 +92,7 @@ impl QueryExecutorImpl {
             &[("semaphore", "query_execution")],
         ));
         let query_execution_semaphore =
-            Arc::new(semaphore_metrics.new_semaphore(concurrent_query_limit));
+            Arc::new(semaphore_metrics.new_semaphore(Semaphore::MAX_PERMITS));
         let query_log = Arc::new(QueryLog::new(
             query_log_size,
             Arc::new(iox_time::SystemProvider::new()),
@@ -716,7 +715,6 @@ mod tests {
             exec,
             metrics,
             datafusion_config,
-            concurrent_query_limit: 10,
             query_log_size: 10,
             telemetry_store,
             sys_events_store,