graceful shutdown

.dockerignore

@@ -1 +1,2 @@
 target
+*docker*

crates/common/src/graceful_shutdown.rs

@@ -0,0 +1,23 @@
+use tokio::signal;
+
+pub async fn shutdown_signal() {
+    let ctrl_c = async {
+        signal::ctrl_c().await.expect("failed to install Ctrl+C handler");
+    };
+
+    #[cfg(unix)]
+    let terminate = async {
+        signal::unix::signal(signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    tokio::select! {
+        _ = ctrl_c => {},
+        _ = terminate => {},
+    }
+}

crates/common/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod argvec;
+pub mod graceful_shutdown;
 pub mod job;
 pub mod job_record;
 pub mod job_trace;

crates/delegator/src/main.rs

@@ -3,6 +3,7 @@
 use futures::{stream::FuturesUnordered, StreamExt};
 use libp2p::gossipsub::Event;
 use sharp_p2p_common::{
+    graceful_shutdown::shutdown_signal,
     hash,
     job::Job,
     network::Network,
@@ -109,6 +110,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 send_topic_tx.send(serialized_job.into()).await?;
                 info!("Sent a new job: {}", hash!(&job));
             },
+            _ = shutdown_signal() => {
+                break
+            }
             else => break
         }
     }

crates/executor/src/main.rs

@@ -3,6 +3,7 @@
 use futures::{stream::FuturesUnordered, StreamExt};
 use libp2p::gossipsub::Event;
 use sharp_p2p_common::{
+    graceful_shutdown::shutdown_signal,
     hash,
     job::Job,
     job_record::JobRecord,
@@ -125,6 +126,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             Some(Ok(job_witness)) = prover_scheduler.next() => {
                 info!("Calculated job_witness: {}", hash!(&job_witness));
             },
+            _ = shutdown_signal() => {
+                break
+            }
             else => break
         };
 

docker-compose.yaml

@@ -27,9 +27,12 @@ services:
       dockerfile: delegator.dockerfile
     depends_on:
       - runtime
+<<<<<<< HEAD
     ports:
       - "5678:5678/udp"
       - "5679:5679/tcp"
+=======
+>>>>>>> f5e88e4 (graceful shutdown)
     deploy:
       resources:
         limits:
@@ -41,9 +44,12 @@ services:
       dockerfile: executor.dockerfile
     depends_on:
       - runtime
+<<<<<<< HEAD
     ports:
       - "5698:5678/udp"
       - "5699:5679/tcp"
+=======
+>>>>>>> f5e88e4 (graceful shutdown)
     deploy:
       resources:
         limits:

runtime.dockerfile

@@ -66,8 +66,20 @@ COPY --from=stone-prover /bin/cpu_air_verifier /root/.local/bin/
 WORKDIR /sharp-p2p
 
 # Copy the current directory content into the container
+<<<<<<< HEAD
 COPY . .
 
 # Install requirements
 RUN cargo make python-requirements-install && \
     cargo make python-bootloader-install
+=======
+COPY cairo/ cairo/
+COPY requirements.txt requirements.txt
+
+# Install requirements
+RUN pip install -r requirements.txt && \
+    pip install cairo/
+
+# Copy the current directory content into the container
+COPY . .
+>>>>>>> f5e88e4 (graceful shutdown)