(datafusion-ballista) branch main updated: Promote keda and flight-sql to optional features (#1079)

[agrove]

This is an automated email from the ASF dual-hosted git repository.

agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-ballista.git


The following commit(s) were added to refs/heads/main by this push:
     new 5c7f4af6 Promote keda and flight-sql to optional features (#1079)
5c7f4af6 is described below

commit 5c7f4af6b87044d9f10bf44d5289bbbaee6ab6a5
Author: Marko Milenković <milenkov...@users.noreply.github.com>
AuthorDate: Mon Oct 14 21:52:55 2024 +0100

    Promote keda and flight-sql to optional features (#1079)
    
    * remove flight-sql from scheduler default options
    
    * keda-scheduler is optional feature (off by default)
---
 ballista/scheduler/Cargo.toml                  |  3 ++-
 ballista/scheduler/src/scheduler_process.rs    | 10 ++++++----
 ballista/scheduler/src/scheduler_server/mod.rs |  2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ballista/scheduler/Cargo.toml b/ballista/scheduler/Cargo.toml
index 3543cdd8..e6c4b3ad 100644
--- a/ballista/scheduler/Cargo.toml
+++ b/ballista/scheduler/Cargo.toml
@@ -34,8 +34,9 @@ name = "ballista-scheduler"
 path = "src/bin/main.rs"
 
 [features]
-default = ["flight-sql"]
+default = []
 flight-sql = []
+keda-scaler = []
 prometheus-metrics = ["prometheus", "once_cell"]
 
 [dependencies]
diff --git a/ballista/scheduler/src/scheduler_process.rs 
b/ballista/scheduler/src/scheduler_process.rs
index 1f7f7ac3..140dc141 100644
--- a/ballista/scheduler/src/scheduler_process.rs
+++ b/ballista/scheduler/src/scheduler_process.rs
@@ -29,8 +29,10 @@ use std::{net::SocketAddr, sync::Arc};
 use crate::api::get_routes;
 use crate::cluster::BallistaCluster;
 use crate::config::SchedulerConfig;
+#[cfg(feature = "flight-sql")]
 use crate::flight_sql::FlightSqlServiceImpl;
 use crate::metrics::default_metrics_collector;
+#[cfg(feature = "keda-scaler")]
 use 
crate::scheduler_server::externalscaler::external_scaler_server::ExternalScalerServer;
 use crate::scheduler_server::SchedulerServer;
 
@@ -67,11 +69,11 @@ pub async fn start_server(
         
.max_encoding_message_size(config.grpc_server_max_encoding_message_size as 
usize)
         
.max_decoding_message_size(config.grpc_server_max_decoding_message_size as 
usize);
 
-    let keda_scaler = ExternalScalerServer::new(scheduler_server.clone());
+    let tonic_builder = 
create_grpc_server().add_service(scheduler_grpc_server);
 
-    let tonic_builder = create_grpc_server()
-        .add_service(scheduler_grpc_server)
-        .add_service(keda_scaler);
+    #[cfg(feature = "keda-scaler")]
+    let tonic_builder =
+        
tonic_builder.add_service(ExternalScalerServer::new(scheduler_server.clone()));
 
     #[cfg(feature = "flight-sql")]
     let tonic_builder = tonic_builder.add_service(FlightServiceServer::new(
diff --git a/ballista/scheduler/src/scheduler_server/mod.rs 
b/ballista/scheduler/src/scheduler_server/mod.rs
index e6e6739e..59b988bc 100644
--- a/ballista/scheduler/src/scheduler_server/mod.rs
+++ b/ballista/scheduler/src/scheduler_server/mod.rs
@@ -44,12 +44,14 @@ use crate::state::task_manager::TaskLauncher;
 use crate::state::SchedulerState;
 
 // include the generated protobuf source as a submodule
+#[cfg(feature = "keda-scaler")]
 #[allow(clippy::all)]
 pub mod externalscaler {
     include!(concat!(env!("OUT_DIR"), "/externalscaler.rs"));
 }
 
 pub mod event;
+#[cfg(feature = "keda-scaler")]
 mod external_scaler;
 mod grpc;
 pub(crate) mod query_stage_scheduler;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org