Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.3.2"
version = "2.3.3"
authors = ["Gaius <gaius.qi@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
733 changes: 375 additions & 358 deletions pkg/apis/scheduler/v2/scheduler.pb.go

Large diffs are not rendered by default.

2 changes: 2 additions & 0 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.

5 changes: 5 additions & 0 deletions pkg/apis/scheduler/v2/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,11 @@ message StatImageRequest {
pattern: "^(all_seed_peers|all_peers)$"
ignore_empty: true
}];
// enable_task_id_based_blob_digest indicates whether to use the blob digest for task ID calculation
// when the layer url is an OCI blob url (e.g., /v2/<name>/blobs/sha256:<digest>). It should be
// consistent with the value used when the image was preheated, otherwise the tasks can not be
// found on the peers.
bool enable_task_id_based_blob_digest = 16;
}

// StatImageResponse represents response of StatImage.
Expand Down
5 changes: 5 additions & 0 deletions proto/scheduler.proto
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,11 @@ message StatImageRequest {
// - all_peers: stat image from all available peers.
// If not specified, stat image from all available peers.
string scope = 15;
// enable_task_id_based_blob_digest indicates whether to use the blob digest for task ID calculation
// when the layer url is an OCI blob url (e.g., /v2/<name>/blobs/sha256:<digest>). It should be
// consistent with the value used when the image was preheated, otherwise the tasks can not be
// found on the peers.
bool enable_task_id_based_blob_digest = 16;
}

// StatImageResponse represents response of StatImage.
Expand Down
44 changes: 22 additions & 22 deletions python/dragonfly_api/scheduler_pb2.py

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions python/dragonfly_api/scheduler_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ class PreheatImageRequest(_message.Message):
def __init__(self, url: _Optional[str] = ..., piece_length: _Optional[int] = ..., tag: _Optional[str] = ..., application: _Optional[str] = ..., filtered_query_params: _Optional[_Iterable[str]] = ..., header: _Optional[_Mapping[str, str]] = ..., username: _Optional[str] = ..., password: _Optional[str] = ..., platform: _Optional[str] = ..., scope: _Optional[str] = ..., ips: _Optional[_Iterable[str]] = ..., percentage: _Optional[int] = ..., count: _Optional[int] = ..., concurrent_task_count: _Optional[int] = ..., concurrent_peer_count: _Optional[int] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., priority: _Optional[_Union[_common_pb2.Priority, str]] = ..., certificate_chain: _Optional[_Iterable[bytes]] = ..., insecure_skip_verify: bool = ...) -> None: ...

class StatImageRequest(_message.Message):
__slots__ = ("url", "piece_length", "tag", "application", "filtered_query_params", "header", "username", "password", "platform", "concurrent_layer_count", "concurrent_peer_count", "timeout", "certificate_chain", "insecure_skip_verify", "scope")
__slots__ = ("url", "piece_length", "tag", "application", "filtered_query_params", "header", "username", "password", "platform", "concurrent_layer_count", "concurrent_peer_count", "timeout", "certificate_chain", "insecure_skip_verify", "scope", "enable_task_id_based_blob_digest")
class HeaderEntry(_message.Message):
__slots__ = ("key", "value")
KEY_FIELD_NUMBER: _ClassVar[int]
Expand All @@ -834,6 +834,7 @@ class StatImageRequest(_message.Message):
CERTIFICATE_CHAIN_FIELD_NUMBER: _ClassVar[int]
INSECURE_SKIP_VERIFY_FIELD_NUMBER: _ClassVar[int]
SCOPE_FIELD_NUMBER: _ClassVar[int]
ENABLE_TASK_ID_BASED_BLOB_DIGEST_FIELD_NUMBER: _ClassVar[int]
url: str
piece_length: int
tag: str
Expand All @@ -849,7 +850,8 @@ class StatImageRequest(_message.Message):
certificate_chain: _containers.RepeatedScalarFieldContainer[bytes]
insecure_skip_verify: bool
scope: str
def __init__(self, url: _Optional[str] = ..., piece_length: _Optional[int] = ..., tag: _Optional[str] = ..., application: _Optional[str] = ..., filtered_query_params: _Optional[_Iterable[str]] = ..., header: _Optional[_Mapping[str, str]] = ..., username: _Optional[str] = ..., password: _Optional[str] = ..., platform: _Optional[str] = ..., concurrent_layer_count: _Optional[int] = ..., concurrent_peer_count: _Optional[int] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., certificate_chain: _Optional[_Iterable[bytes]] = ..., insecure_skip_verify: bool = ..., scope: _Optional[str] = ...) -> None: ...
enable_task_id_based_blob_digest: bool
def __init__(self, url: _Optional[str] = ..., piece_length: _Optional[int] = ..., tag: _Optional[str] = ..., application: _Optional[str] = ..., filtered_query_params: _Optional[_Iterable[str]] = ..., header: _Optional[_Mapping[str, str]] = ..., username: _Optional[str] = ..., password: _Optional[str] = ..., platform: _Optional[str] = ..., concurrent_layer_count: _Optional[int] = ..., concurrent_peer_count: _Optional[int] = ..., timeout: _Optional[_Union[datetime.timedelta, _duration_pb2.Duration, _Mapping]] = ..., certificate_chain: _Optional[_Iterable[bytes]] = ..., insecure_skip_verify: bool = ..., scope: _Optional[str] = ..., enable_task_id_based_blob_digest: bool = ...) -> None: ...

class StatImageResponse(_message.Message):
__slots__ = ("image", "peers")
Expand Down
Binary file modified src/descriptor.bin
Binary file not shown.
6 changes: 6 additions & 0 deletions src/scheduler.v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,12 @@ pub struct StatImageRequest {
/// If not specified, stat image from all available peers.
#[prost(string, tag = "15")]
pub scope: ::prost::alloc::string::String,
/// enable_task_id_based_blob_digest indicates whether to use the blob digest for task ID calculation
/// when the layer url is an OCI blob url (e.g., /v2/<name>/blobs/sha256:<digest>). It should be
/// consistent with the value used when the image was preheated, otherwise the tasks can not be
/// found on the peers.
#[prost(bool, tag = "16")]
pub enable_task_id_based_blob_digest: bool,
}
/// StatImageResponse represents response of StatImage.
#[derive(serde::Serialize, serde::Deserialize)]
Expand Down
Loading