Skip to content

Commit e289d92

Browse files
Revert "feat(executor): add polling-based task status and optional heartbeat/push modes (#5)"
This reverts commit c394267.
1 parent c394267 commit e289d92

9 files changed

Lines changed: 134 additions & 307 deletions

File tree

ballista/executor/src/config.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ impl TryFrom<Config> for ExecutorProcessConfig {
140140
grpc_max_decoding_message_size: opt.grpc_server_max_decoding_message_size,
141141
grpc_max_encoding_message_size: opt.grpc_server_max_encoding_message_size,
142142
executor_heartbeat_interval_seconds: opt.executor_heartbeat_interval_seconds,
143-
disable_scheduler_heartbeats: false,
144-
disable_task_status_push: false,
145143
override_execution_engine: None,
146144
override_function_registry: None,
147145
override_config_producer: None,

ballista/executor/src/executor.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use crate::execution_engine::ExecutionEngine;
2222
use crate::execution_engine::QueryStageExecutor;
2323
use crate::metrics::ExecutorMetricsCollector;
2424
use crate::metrics::LoggingMetricsCollector;
25-
use crate::status_store::ExecutorStatusStore;
2625
use ballista_core::error::BallistaError;
2726
use ballista_core::registry::BallistaFunctionRegistry;
2827
use ballista_core::serde::protobuf;
@@ -86,9 +85,6 @@ pub struct Executor {
8685
/// Execution engine that the executor will delegate to
8786
/// for executing query stages
8887
pub(crate) execution_engine: Arc<dyn ExecutionEngine>,
89-
90-
/// Stores task status updates for scheduler polling.
91-
status_store: Arc<ExecutorStatusStore>,
9288
}
9389

9490
impl Executor {
@@ -137,7 +133,6 @@ impl Executor {
137133
abort_handles: Default::default(),
138134
execution_engine: execution_engine
139135
.unwrap_or_else(|| Arc::new(DefaultExecutionEngine {})),
140-
status_store: Arc::new(ExecutorStatusStore::new()),
141136
}
142137
}
143138
}
@@ -154,11 +149,6 @@ impl Executor {
154149
(self.config_producer)()
155150
}
156151

157-
#[must_use]
158-
pub fn status_store(&self) -> Arc<ExecutorStatusStore> {
159-
Arc::clone(&self.status_store)
160-
}
161-
162152
/// Execute one partition of a query stage and persist the result to disk in IPC format. On
163153
/// success, return a RecordBatch containing metadata about the results, including path
164154
/// and statistics.

ballista/executor/src/executor_process.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ pub struct ExecutorProcessConfig {
9494
/// The maximum size of an encoded message
9595
pub grpc_max_encoding_message_size: u32,
9696
pub executor_heartbeat_interval_seconds: u64,
97-
/// Disable outbound scheduler heartbeats for polling-based health.
98-
pub disable_scheduler_heartbeats: bool,
99-
/// Disable outbound task status updates for polling-based status.
100-
pub disable_task_status_push: bool,
10197
/// Optional execution engine to use to execute physical plans, will default to
10298
/// DataFusion if none is provided.
10399
pub override_execution_engine: Option<Arc<dyn ExecutionEngine>>,
@@ -151,8 +147,6 @@ impl Default for ExecutorProcessConfig {
151147
grpc_max_decoding_message_size: 16777216,
152148
grpc_max_encoding_message_size: 16777216,
153149
executor_heartbeat_interval_seconds: 60,
154-
disable_scheduler_heartbeats: false,
155-
disable_task_status_push: false,
156150
override_execution_engine: None,
157151
override_function_registry: None,
158152
override_runtime_producer: None,

0 commit comments

Comments
 (0)