Skip to content

Commit

Permalink
feat: remove host_id and task_id in RegisterPersistentCachePeerRequest (
Browse files Browse the repository at this point in the history
#442)

Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi authored Jan 16, 2025
1 parent 352bcc2 commit 13a45c2
Show file tree
Hide file tree
Showing 9 changed files with 926 additions and 399 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dragonfly-api"
version = "2.1.6"
version = "2.1.7"
authors = ["Gaius <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
585 changes: 585 additions & 0 deletions pkg/apis/dfdaemon/v2/mocks/dfdaemon_mock.go

Large diffs are not rendered by default.

670 changes: 324 additions & 346 deletions pkg/apis/scheduler/v2/scheduler.pb.go

Large diffs are not rendered by default.

22 changes: 0 additions & 22 deletions pkg/apis/scheduler/v2/scheduler.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions pkg/apis/scheduler/v2/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -226,20 +226,16 @@ message DeleteHostRequest{

// RegisterPersistentCachePeerRequest represents persistent cache peer registered request of AnnouncePersistentCachePeerRequest.
message RegisterPersistentCachePeerRequest {
// Host id.
string host_id = 1 [(validate.rules).string.min_len = 1];
// Task id.
string task_id = 2 [(validate.rules).string.min_len = 1];
// Tag is used to distinguish different persistent cache tasks.
optional string tag = 3;
optional string tag = 1;
// Application of task.
optional string application = 4;
optional string application = 2;
// Task piece length.
uint64 piece_length = 5 [(validate.rules).uint64.gte = 1];
uint64 piece_length = 3 [(validate.rules).uint64.gte = 1];
// File path to be exported.
optional string output_path = 6 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
optional string output_path = 4 [(validate.rules).string = {min_len: 1, ignore_empty: true}];
// Download timeout.
optional google.protobuf.Duration timeout = 7;
optional google.protobuf.Duration timeout = 5;
}

// DownloadPersistentCachePeerStartedRequest represents persistent cache peer download started request of AnnouncePersistentCachePeerRequest.
Expand Down
14 changes: 5 additions & 9 deletions proto/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -217,20 +217,16 @@ message DeleteHostRequest{

// RegisterPersistentCachePeerRequest represents persistent cache peer registered request of AnnouncePersistentCachePeerRequest.
message RegisterPersistentCachePeerRequest {
// Host id.
string host_id = 1;
// Task id.
string task_id = 2;
// Tag is used to distinguish different persistent cache tasks.
optional string tag = 3;
optional string tag = 1;
// Application of task.
optional string application = 4;
optional string application = 2;
// Task piece length.
uint64 piece_length = 5;
uint64 piece_length = 3;
// File path to be exported.
optional string output_path = 6;
optional string output_path = 4;
// Download timeout.
optional google.protobuf.Duration timeout = 7;
optional google.protobuf.Duration timeout = 5;
}

// DownloadPersistentCachePeerStartedRequest represents persistent cache peer download started request of AnnouncePersistentCachePeerRequest.
Expand Down
Binary file modified src/descriptor.bin
Binary file not shown.
16 changes: 5 additions & 11 deletions src/scheduler.v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,26 +334,20 @@ pub struct DeleteHostRequest {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct RegisterPersistentCachePeerRequest {
/// Host id.
#[prost(string, tag = "1")]
pub host_id: ::prost::alloc::string::String,
/// Task id.
#[prost(string, tag = "2")]
pub task_id: ::prost::alloc::string::String,
/// Tag is used to distinguish different persistent cache tasks.
#[prost(string, optional, tag = "3")]
#[prost(string, optional, tag = "1")]
pub tag: ::core::option::Option<::prost::alloc::string::String>,
/// Application of task.
#[prost(string, optional, tag = "4")]
#[prost(string, optional, tag = "2")]
pub application: ::core::option::Option<::prost::alloc::string::String>,
/// Task piece length.
#[prost(uint64, tag = "5")]
#[prost(uint64, tag = "3")]
pub piece_length: u64,
/// File path to be exported.
#[prost(string, optional, tag = "6")]
#[prost(string, optional, tag = "4")]
pub output_path: ::core::option::Option<::prost::alloc::string::String>,
/// Download timeout.
#[prost(message, optional, tag = "7")]
#[prost(message, optional, tag = "5")]
pub timeout: ::core::option::Option<::prost_wkt_types::Duration>,
}
/// DownloadPersistentCachePeerStartedRequest represents persistent cache peer download started request of AnnouncePersistentCachePeerRequest.
Expand Down

0 comments on commit 13a45c2

Please sign in to comment.