WIP: Solving deadlock

Cargo.toml

@@ -20,4 +20,5 @@ bytes = { version = "1", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 bincode = "1.3.3"
 rand = "0.8.5"
-clokwerk = "0.4.0"
+crossbeam = "0.8.4"
+crossbeam-skiplist = "0.1.3"

scripts/node1.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export ROG_HOME=~/.rog1
-RUST_LOG=trace ./target/debug/rog-server --port 7878 \
+RUST_LOG=$1 ./target/debug/rog-server --port 7878 \
                --id 1 --node-ids 2 --node-ids 3 \
                --node-addresses "localhost:7879" \
                --node-addresses "localhost:7880"

scripts/node2.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export ROG_HOME=~/.rog2
-RUST_LOG=trace ./target/debug/rog-server --port 7879 \
+RUST_LOG=$1 ./target/debug/rog-server --port 7879 \
                --id 2 --node-ids 1 --node-ids 3 \
                --node-addresses "localhost:7878" \
                --node-addresses "localhost:7880"

scripts/node3.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export ROG_HOME=~/.rog3
-RUST_LOG=trace ./target/debug/rog-server --port 7880 \
+RUST_LOG=$1 ./target/debug/rog-server --port 7880 \
                --id 3 --node-ids 1 --node-ids 2 \
                --node-addresses "localhost:7878" \
                --node-addresses "localhost:7879"

src/bin/server.rs

@@ -74,7 +74,6 @@ async fn main() {
     tokio::spawn(async move {
         loop {
             tokio::time::sleep(Duration::from_millis(100)).await;
-            //trace!("Broadcasting");
             server_clone.lock().await.broadcast_current_log().await;
         }
     });
@@ -89,13 +88,14 @@ async fn main() {
             tokio::time::sleep(election_timeout).await;
             // TODO Check if election is needed.
             // If heartbeats not received, then:
-            trace!("Start new election");
             let mut server = server_clone.lock().await;
             let time_elapsed = Instant::now() - election_timeout;
-            if server
-                .last_heartbeat()
+            let last_heartbeat = server.last_heartbeat().await;
+            if last_heartbeat
                 .is_some_and(|heartbeat| heartbeat.duration_since(time_elapsed) > election_timeout)
+                || last_heartbeat.is_none()
             {
+                warn!("No heartbeats from leader, starting a new election");
                 server.start_election().await;
             }
         }