Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ballista/executor/src/executor_process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use std::time::{Duration, Instant, UNIX_EPOCH};

use arrow_flight::flight_service_server::FlightServiceServer;
use ballista_core::registry::BallistaFunctionRegistry;
use datafusion::DATAFUSION_VERSION;
use datafusion_proto::logical_plan::LogicalExtensionCodec;
use datafusion_proto::physical_plan::PhysicalExtensionCodec;
use futures::StreamExt;
Expand Down Expand Up @@ -223,7 +224,9 @@ pub async fn start_executor_process(
let task_scheduling_policy = opt.task_scheduling_policy;
// assign this executor an unique ID
let executor_id = Uuid::new_v4().to_string();
info!("Executor starting ... (Datafusion Ballista {BALLISTA_VERSION})");
info!(
"Ballista Executor v{BALLISTA_VERSION} (DataFusion v{DATAFUSION_VERSION}) starting ..."
);
info!("Executor id: {executor_id}");
info!("Executor working directory: {work_dir}");
info!("Executor number of concurrent tasks: {concurrent_tasks}");
Expand Down
5 changes: 5 additions & 0 deletions ballista/scheduler/src/api/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use axum::{
};
use ballista_core::BALLISTA_VERSION;
use ballista_core::serde::protobuf::job_status::Status;
use datafusion::DATAFUSION_VERSION;
use datafusion::physical_plan::metrics::{MetricValue, MetricsSet, Time};
use datafusion_proto::logical_plan::AsLogicalPlan;
use datafusion_proto::physical_plan::AsExecutionPlan;
Expand All @@ -38,6 +39,7 @@ use std::time::Duration;
struct SchedulerStateResponse {
started: u128,
version: &'static str,
datafusion_version: &'static str,
substrait_support: bool,
keda_support: bool,
prometheus_support: bool,
Expand All @@ -51,6 +53,7 @@ struct SchedulerStateResponse {
#[derive(Debug, serde::Serialize)]
struct SchedulerVersionResponse {
version: &'static str,
datafusion_version: &'static str,
}
#[derive(Debug, serde::Serialize)]
pub struct ExecutorMetaResponse {
Expand Down Expand Up @@ -102,6 +105,7 @@ pub async fn get_scheduler_state<
let response = SchedulerStateResponse {
started: data_server.start_time,
version: BALLISTA_VERSION,
datafusion_version: DATAFUSION_VERSION,
substrait_support: cfg!(feature = "substrait"),
keda_support: cfg!(feature = "keda-scaler"),
prometheus_support: cfg!(feature = "prometheus-metrics"),
Expand All @@ -120,6 +124,7 @@ pub async fn get_scheduler_state<
pub async fn get_scheduler_version() -> impl IntoResponse {
let response = SchedulerVersionResponse {
version: BALLISTA_VERSION,
datafusion_version: DATAFUSION_VERSION,
};
Json(response)
}
Expand Down
5 changes: 4 additions & 1 deletion ballista/scheduler/src/scheduler_process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use ballista_core::serde::protobuf::scheduler_grpc_server::SchedulerGrpcServer;
use ballista_core::serde::{
BallistaCodec, BallistaLogicalExtensionCodec, BallistaPhysicalExtensionCodec,
};
use datafusion::DATAFUSION_VERSION;
use datafusion_proto::logical_plan::AsLogicalPlan;
use datafusion_proto::physical_plan::AsExecutionPlan;
use datafusion_proto::protobuf::{LogicalPlanNode, PhysicalPlanNode};
Expand Down Expand Up @@ -171,7 +172,9 @@ pub async fn start_server(
address: SocketAddr,
config: Arc<SchedulerConfig>,
) -> ballista_core::error::Result<()> {
info!("Ballista v{BALLISTA_VERSION} Scheduler listening on {address:?}");
info!(
"Ballista Scheduler v{BALLISTA_VERSION} (DataFusion v{DATAFUSION_VERSION}) listening on {address:?}"
);
let scheduler =
create_scheduler::<LogicalPlanNode, PhysicalPlanNode>(cluster, config).await?;

Expand Down
5 changes: 4 additions & 1 deletion ballista/scheduler/src/standalone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use ballista_core::{
BALLISTA_VERSION, error::Result,
serde::protobuf::scheduler_grpc_server::SchedulerGrpcServer,
};
use datafusion::DATAFUSION_VERSION;
use datafusion::execution::SessionState;
use datafusion::prelude::SessionConfig;
use datafusion_proto::protobuf::LogicalPlanNode;
Expand Down Expand Up @@ -104,7 +105,9 @@ pub async fn new_standalone_scheduler_with_builder(
// Let the OS assign a random, free port
let listener = TcpListener::bind("localhost:0").await?;
let addr = listener.local_addr()?;
info!("Ballista v{BALLISTA_VERSION} Rust Scheduler listening on {addr:?}");
info!(
"Ballista Scheduler v{BALLISTA_VERSION} (DataFusion v{DATAFUSION_VERSION}) listening on {addr:?}"
);
tokio::spawn(
create_grpc_server(&GrpcServerConfig::default())
.add_service(server)
Expand Down
Loading