feat: set digest to optional for persistent cache task

Signed-off-by: Gaius <[email protected]>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dragonfly-api"
-version = "2.1.5"
+version = "2.1.6"
 authors = ["Gaius <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

pkg/apis/common/v2/common.proto

@@ -221,7 +221,7 @@ message PersistentCacheTask {
   // the persistent cache task will be deleted when dfdaemon runs garbage collection.
   uint64 current_replica_count = 4;
   // Digest of the task digest, for example blake3:xxx or sha256:yyy.
-  string digest = 5 [(validate.rules).string = {pattern: "^(md5:[a-fA-F0-9]{32}|sha1:[a-fA-F0-9]{40}|sha256:[a-fA-F0-9]{64}|sha512:[a-fA-F0-9]{128}|blake3:[a-fA-F0-9]{64}|crc32:[a-fA-F0-9]+)$"}];
+  optional string digest = 5 [(validate.rules).string = {pattern: "^(md5:[a-fA-F0-9]{32}|sha1:[a-fA-F0-9]{40}|sha256:[a-fA-F0-9]{64}|sha512:[a-fA-F0-9]{128}|blake3:[a-fA-F0-9]{64}|crc32:[a-fA-F0-9]+)$", ignore_empty: true}];
   // Tag is used to distinguish different persistent cache tasks.
   optional string tag = 6;
   // Application of task.

pkg/apis/dfdaemon/v2/dfdaemon.proto

@@ -138,14 +138,16 @@ message WritePersistentCacheTaskRequest {
 
 // WritePersistentCacheTaskStartedRequest represents task write started request of WritePersistentCacheTaskRequest.
 message WritePersistentCacheTaskStartedRequest {
+  // Task content length.
+  uint64 content_length = 1;
   // Replica count of the persistent persistent cache task.
-  uint64 persistent_replica_count = 1 [(validate.rules).uint64 = {gte: 1, lte: 5}];
+  uint64 persistent_replica_count = 2 [(validate.rules).uint64 = {gte: 1, lte: 5}];
   // Tag is used to distinguish different persistent cache tasks.
-  optional string tag = 2;
+  optional string tag = 3;
   // Application of task.
-  optional string application = 3;
+  optional string application = 4;
   // TTL of the persistent cache task.
-  google.protobuf.Duration ttl = 4 [(validate.rules).duration = {gte:{seconds: 60}, lte:{seconds: 604800}}];
+  google.protobuf.Duration ttl = 5 [(validate.rules).duration = {gte:{seconds: 60}, lte:{seconds: 604800}}];
 }
 
 // WritePersistentCacheTaskFinishedRequest represents task write finished request of WritePersistentCacheTaskRequest.

pkg/apis/scheduler/v2/scheduler.proto

@@ -340,7 +340,7 @@ message UploadPersistentCacheTaskStartedRequest {
   // Replica count of the persistent cache task.
   uint64 persistent_replica_count = 4 [(validate.rules).uint64.gte = 1];
     // Digest of the task digest, for example blake3:xxx or sha256:yyy.
-  string digest = 5 [(validate.rules).string = {pattern: "^(md5:[a-fA-F0-9]{32}|sha1:[a-fA-F0-9]{40}|sha256:[a-fA-F0-9]{64}|sha512:[a-fA-F0-9]{128}|blake3:[a-fA-F0-9]{64}|crc32:[a-fA-F0-9]+)$"}];
+  optional string digest = 5 [(validate.rules).string = {pattern: "^(md5:[a-fA-F0-9]{32}|sha1:[a-fA-F0-9]{40}|sha256:[a-fA-F0-9]{64}|sha512:[a-fA-F0-9]{128}|blake3:[a-fA-F0-9]{64}|crc32:[a-fA-F0-9]+)$", ignore_empty: true}];
   // Tag is used to distinguish different persistent cache tasks.
   optional string tag = 6;
   // Application of task.

proto/common.proto

@@ -215,7 +215,7 @@ message PersistentCacheTask {
   // the persistent cache task will be deleted when dfdaemon runs garbage collection.
   uint64 current_replica_count = 4;
   // Digest of the task digest, for example blake3:xxx or sha256:yyy.
-  string digest = 5;
+  optional string digest = 5;
   // Tag is used to distinguish different persistent cache tasks.
   optional string tag = 6;
   // Application of task.

proto/dfdaemon.proto

@@ -125,14 +125,16 @@ message WritePersistentCacheTaskRequest {
 
 // WritePersistentCacheTaskStartedRequest represents task write started request of WritePersistentCacheTaskRequest.
 message WritePersistentCacheTaskStartedRequest {
+  // Persistent cache task content length, it is used to calculate the piece length.
+  uint64 content_length = 1;
   // Replica count of the persistent persistent cache task.
-  uint64 persistent_replica_count = 1;
+  uint64 persistent_replica_count = 2;
   // Tag is used to distinguish different persistent cache tasks.
-  optional string tag = 2;
+  optional string tag = 3;
   // Application of task.
-  optional string application = 3;
+  optional string application = 4;
   // TTL of the persistent cache task.
-  google.protobuf.Duration ttl = 4;
+  google.protobuf.Duration ttl = 5;
 }
 
 // WritePersistentCacheTaskFinishedRequest represents task write finished request of WritePersistentCacheTaskRequest.

proto/scheduler.proto

@@ -327,7 +327,7 @@ message UploadPersistentCacheTaskStartedRequest {
   // Replica count of the persistent cache task.
   uint64 persistent_replica_count = 4;
   // Digest of the task digest, for example blake3:xxx or sha256:yyy.
-  string digest = 5;
+  optional string digest = 5;
   // Tag is used to distinguish different persistent cache tasks.
   optional string tag = 6;
   // Application of task.

src/common.v2.rs

@@ -161,8 +161,8 @@ pub struct PersistentCacheTask {
     #[prost(uint64, tag = "4")]
     pub current_replica_count: u64,
     /// Digest of the task digest, for example blake3:xxx or sha256:yyy.
-    #[prost(string, tag = "5")]
-    pub digest: ::prost::alloc::string::String,
+    #[prost(string, optional, tag = "5")]
+    pub digest: ::core::option::Option<::prost::alloc::string::String>,
     /// Tag is used to distinguish different persistent cache tasks.
     #[prost(string, optional, tag = "6")]
     pub tag: ::core::option::Option<::prost::alloc::string::String>,

src/dfdaemon.v2.rs

@@ -172,17 +172,20 @@ pub mod write_persistent_cache_task_request {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WritePersistentCacheTaskStartedRequest {
-    /// Replica count of the persistent persistent cache task.
+    /// Persistent cache task content length, it is used to calculate the piece length.
     #[prost(uint64, tag = "1")]
+    pub content_length: u64,
+    /// Replica count of the persistent persistent cache task.
+    #[prost(uint64, tag = "2")]
     pub persistent_replica_count: u64,
     /// Tag is used to distinguish different persistent cache tasks.
-    #[prost(string, optional, tag = "2")]
+    #[prost(string, optional, tag = "3")]
     pub tag: ::core::option::Option<::prost::alloc::string::String>,
     /// Application of task.
-    #[prost(string, optional, tag = "3")]
+    #[prost(string, optional, tag = "4")]
     pub application: ::core::option::Option<::prost::alloc::string::String>,
     /// TTL of the persistent cache task.
-    #[prost(message, optional, tag = "4")]
+    #[prost(message, optional, tag = "5")]
     pub ttl: ::core::option::Option<::prost_wkt_types::Duration>,
 }
 /// WritePersistentCacheTaskFinishedRequest represents task write finished request of WritePersistentCacheTaskRequest.

src/scheduler.v2.rs

@@ -529,8 +529,8 @@ pub struct UploadPersistentCacheTaskStartedRequest {
     #[prost(uint64, tag = "4")]
     pub persistent_replica_count: u64,
     /// Digest of the task digest, for example blake3:xxx or sha256:yyy.
-    #[prost(string, tag = "5")]
-    pub digest: ::prost::alloc::string::String,
+    #[prost(string, optional, tag = "5")]
+    pub digest: ::core::option::Option<::prost::alloc::string::String>,
     /// Tag is used to distinguish different persistent cache tasks.
     #[prost(string, optional, tag = "6")]
     pub tag: ::core::option::Option<::prost::alloc::string::String>,