feat: announce disable shared for scheduler (#735)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Sep 14, 2024 · e0914ff · e0914ff
1 parent 9174799
commit e0914ff
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ dragonfly-client-backend = { path = "dragonfly-client-backend", version = "0.1.1
 dragonfly-client-util = { path = "dragonfly-client-util", version = "0.1.108" }
 dragonfly-client-init = { path = "dragonfly-client-init", version = "0.1.108" }
 thiserror = "1.0"
-dragonfly-api = "=2.0.154"
+dragonfly-api = "=2.0.157"
 reqwest = { version = "0.12.4", features = ["stream", "native-tls", "default-tls", "rustls-tls"] }
 rcgen = { version = "0.12.1", features = ["x509-parser"] }
 hyper = { version = "1.4", features = ["full"] }

diff --git a/dragonfly-client-config/src/dfdaemon.rs b/dragonfly-client-config/src/dfdaemon.rs
@@ -439,6 +439,9 @@ pub struct Upload {
     // server is the upload server configuration for dfdaemon.
     pub server: UploadServer,
 
+    // disable_shared indicates whether disable to share data for other peers.
+    pub disable_shared: bool,
+
     // rate_limit is the rate limit of the upload speed in GiB/Mib/Kib per second.
     #[serde(with = "bytesize_serde", default = "default_upload_rate_limit")]
     pub rate_limit: ByteSize,
@@ -449,6 +452,7 @@ impl Default for Upload {
     fn default() -> Self {
         Upload {
             server: UploadServer::default(),
+            disable_shared: false,
             rate_limit: default_upload_rate_limit(),
         }
     }

diff --git a/dragonfly-client-storage/src/content.rs b/dragonfly-client-storage/src/content.rs
@@ -204,7 +204,6 @@ impl Content {
     #[instrument(skip_all)]
     pub async fn read_task_by_range(&self, task_id: &str, range: Range) -> Result<impl AsyncRead> {
         let task_path = self.dir.join(task_id);
-
         let mut from_f = File::open(task_path.as_path()).await.map_err(|err| {
             error!("open {:?} failed: {}", task_path, err);
             err
@@ -243,7 +242,6 @@ impl Content {
         range: Option<Range>,
     ) -> Result<impl AsyncRead> {
         let task_path = self.dir.join(task_id);
-
         if let Some(range) = range {
             let target_offset = max(offset, range.start);
             let target_length =

diff --git a/dragonfly-client/src/announcer/mod.rs b/dragonfly-client/src/announcer/mod.rs
@@ -292,6 +292,7 @@ impl SchedulerAnnouncer {
 
             // TODO: Get scheduler cluster id from dynconfig.
             scheduler_cluster_id: 0,
+            disable_shared: self.config.upload.disable_shared,
         };
 
         Ok(AnnounceHostRequest {