osrdyne: add process-compose driver

Signed-off-by: Leo Valais <[email protected]>
OpenRailAssociation · Sep 9, 2024 · 23edcec · 23edcec
1 parent 3eecd56
commit 23edcec
Show file tree

Hide file tree

Showing 11 changed files with 467 additions and 10 deletions.
diff --git a/osrdyne/configuration_templates/process-compose-driver.yaml b/osrdyne/configuration_templates/process-compose-driver.yaml
@@ -0,0 +1,11 @@
+worker_driver:
+  type: ProcessComposeDriver
+  address: localhost
+  port: 8080 # process-compose sets it to 8080 by default, better change it...
+  process: core # the process name to scale
+
+  # Files to write the content of the osrdyne environment variables
+  comm_files:
+    worker_id: /tmp/worker_id # WORKER_ID
+    worker_key: /tmp/worker_key # WORKER_KEY
+    amqp_uri: /tmp/worker_amqp_uri # WORKER_AMQP_URI
diff --git a/osrdyne/configuration_templates/process-compose.yaml b/osrdyne/configuration_templates/process-compose.yaml
@@ -0,0 +1,37 @@
+version: "0.5"
+is_strict: true
+
+environment:
+  - "CORE_EDITOAST_URL=http://localhost:8090"
+  - "JAVA_TOOL_OPTIONS=-javaagent:$HOME/opentelemetry-javaagent.jar" # edit this path
+  - "CORE_MONITOR_TYPE=opentelemetry"
+  - "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc"
+  - "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4317"
+  - "OTEL_METRICS_EXPORTER=none"
+  - "OTEL_LOGS_EXPORTER=none"
+
+processes:
+  core:
+    # Disabled by default (started by osrdyne, only the templating matters).
+    # The osrdyne env variables are read from the files specified in the driver configuration.
+    command: |
+      (
+        export WORKER_ID=$(cat /tmp/worker_id);
+        export WORKER_KEY=$(cat /tmp/worker_key);
+        export WORKER_AMQP_URI="$(cat /tmp/worker_amqp_uri);"
+        java $$JAVA_OPTS -ea -jar build/libs/osrd-all.jar worker
+      )
+    working_dir: "$OSRD_PATH/core"
+    disabled: true
+  gateway:
+    command: cargo run
+    working_dir: "$OSRD_PATH/gateway"
+  editoast:
+    command: cargo run runserver
+    working_dir: "$OSRD_PATH/editoast"
+  front:
+    command: yarn start
+    working_dir: "$OSRD_PATH/front"
+  osrdyne:
+    command: cargo run
+    working_dir: "$OSRD_PATH/osrdyne"
diff --git a/osrdyne/src/config.rs b/osrdyne/src/config.rs
@@ -1,6 +1,9 @@
 use std::time::Duration;
 
-use crate::drivers::{docker::DockerDriverOptions, kubernetes::KubernetesDriverOptions};
+use crate::drivers::{
+    docker::DockerDriverOptions, kubernetes::KubernetesDriverOptions,
+    process_compose::PCDriverOptions,
+};
 use serde::{Deserialize, Serialize};
 
 use figment::{
@@ -14,6 +17,7 @@ pub enum WorkerDriverConfig {
     Noop,
     DockerDriver(DockerDriverOptions),
     KubernetesDriver(KubernetesDriverOptions),
+    ProcessComposeDriver(PCDriverOptions),
 }
 
 #[derive(Debug, Deserialize, Serialize)]

diff --git a/osrdyne/src/drivers.rs b/osrdyne/src/drivers.rs
@@ -1,6 +1,7 @@
 pub mod docker;
 pub mod kubernetes;
 pub mod noop;
+pub mod process_compose;
 pub mod worker_driver;
 
 const LABEL_MANAGED_BY: &str = "osrd/managed_by";

diff --git a/osrdyne/src/drivers/docker.rs b/osrdyne/src/drivers/docker.rs
@@ -56,7 +56,7 @@ impl DockerDriver {
 
 impl WorkerDriver for DockerDriver {
     fn get_or_create_worker_group(
-        &self,
+        &mut self,
         worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<Uuid, DriverError>> + Send + '_>> {
         Box::pin(async move {
@@ -140,7 +140,7 @@ impl WorkerDriver for DockerDriver {
     }
 
     fn destroy_worker_group(
-        &self,
+        &mut self,
         worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<(), DriverError>> + Send + '_>> {
         Box::pin(async move {

diff --git a/osrdyne/src/drivers/kubernetes.rs b/osrdyne/src/drivers/kubernetes.rs
@@ -98,7 +98,7 @@ impl KubernetesDriver {
 
 impl WorkerDriver for KubernetesDriver {
     fn get_or_create_worker_group(
-        &self,
+        &mut self,
         worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<Uuid, DriverError>> + Send + '_>> {
         Box::pin(async move {
@@ -245,7 +245,7 @@ impl WorkerDriver for KubernetesDriver {
     }
 
     fn destroy_worker_group(
-        &self,
+        &mut self,
         worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<(), DriverError>> + Send + '_>> {
         Box::pin(async move {

diff --git a/osrdyne/src/drivers/noop.rs b/osrdyne/src/drivers/noop.rs
@@ -18,14 +18,14 @@ impl NoopDriver {
 
 impl WorkerDriver for NoopDriver {
     fn get_or_create_worker_group(
-        &self,
+        &mut self,
         _worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<Uuid, DriverError>> + Send + '_>> {
         Box::pin(async move { Ok(self.fixed_pool_id) })
     }
 
     fn destroy_worker_group(
-        &self,
+        &mut self,
         _worker_key: Key,
     ) -> Pin<Box<dyn Future<Output = Result<(), DriverError>> + Send + '_>> {
         Box::pin(async move { Ok(()) })