fix: shutdown repeatedly during gc (#806)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Oct 28, 2024 · 7ecdb71 · 7ecdb71
1 parent 0a1015b
commit 7ecdb71
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.1.114"
+version = "0.1.115"
 authors = ["The Dragonfly Developers"]
 homepage = "https://d7y.io/"
 repository = "https://github.com/dragonflyoss/client.git"
@@ -22,13 +22,13 @@ readme = "README.md"
 edition = "2021"
 
 [workspace.dependencies]
-dragonfly-client = { path = "dragonfly-client", version = "0.1.114" }
-dragonfly-client-core = { path = "dragonfly-client-core", version = "0.1.114" }
-dragonfly-client-config = { path = "dragonfly-client-config", version = "0.1.114" }
-dragonfly-client-storage = { path = "dragonfly-client-storage", version = "0.1.114" }
-dragonfly-client-backend = { path = "dragonfly-client-backend", version = "0.1.114" }
-dragonfly-client-util = { path = "dragonfly-client-util", version = "0.1.114" }
-dragonfly-client-init = { path = "dragonfly-client-init", version = "0.1.114" }
+dragonfly-client = { path = "dragonfly-client", version = "0.1.115" }
+dragonfly-client-core = { path = "dragonfly-client-core", version = "0.1.115" }
+dragonfly-client-config = { path = "dragonfly-client-config", version = "0.1.115" }
+dragonfly-client-storage = { path = "dragonfly-client-storage", version = "0.1.115" }
+dragonfly-client-backend = { path = "dragonfly-client-backend", version = "0.1.115" }
+dragonfly-client-util = { path = "dragonfly-client-util", version = "0.1.115" }
+dragonfly-client-init = { path = "dragonfly-client-init", version = "0.1.115" }
 thiserror = "1.0"
 dragonfly-api = "=2.0.167"
 reqwest = { version = "0.12.4", features = ["stream", "native-tls", "default-tls", "rustls-tls"] }

diff --git a/dragonfly-client/src/announcer/mod.rs b/dragonfly-client/src/announcer/mod.rs
@@ -187,6 +187,7 @@ impl SchedulerAnnouncer {
                     }
 
                     info!("announce to scheduler shutting down");
+                    return
                 }
             }
         }

diff --git a/dragonfly-client/src/gc/mod.rs b/dragonfly-client/src/gc/mod.rs
@@ -103,6 +103,7 @@ impl GC {
                 _ = shutdown.recv() => {
                     // Shutdown the garbage collector.
                     info!("garbage collector shutting down");
+                    return
                 }
             }
         }

diff --git a/dragonfly-client/src/health/mod.rs b/dragonfly-client/src/health/mod.rs
@@ -71,6 +71,7 @@ impl Health {
             _ = shutdown.recv() => {
                 // Health server shutting down with signals.
                 info!("health server shutting down");
+                return
             }
         }
     }

diff --git a/dragonfly-client/src/metrics/mod.rs b/dragonfly-client/src/metrics/mod.rs
@@ -674,6 +674,7 @@ impl Metrics {
             _ = shutdown.recv() => {
                 // Metrics server shutting down with signals.
                 info!("metrics server shutting down");
+                return
             }
         }
     }

diff --git a/dragonfly-client/src/stats/mod.rs b/dragonfly-client/src/stats/mod.rs
@@ -110,6 +110,7 @@ impl Stats {
             _ = shutdown.recv() => {
                 // Stats server shutting down with signals.
                 info!("stats server shutting down");
+                return
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -187,6 +187,7 @@ impl SchedulerAnnouncer { @@
                         }
                         info!("announce to scheduler shutting down");
+                        return
                     }
                 }
             }
@@ Expand Down @@