Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Worker enumeration #337

Merged
merged 26 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
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: 2 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ poem-openapi = { version = "4.0.0", features = [
prometheus = { version = "0.13.3", features = ["process"] }
proptest = "1.4.0"
prost = "0.12.3"
prost-types = "0.12.3"
rustls = { version = "0.22.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
Expand Down
1 change: 1 addition & 0 deletions golem-api-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ bytes = { workspace = true }
futures-core = { workspace = true }
golem-wasm-rpc = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
serde = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
Expand Down
23 changes: 22 additions & 1 deletion golem-api-grpc/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,27 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.file_descriptor_set_path(out_dir.join("services.bin"))
.extern_path(".wasm.rpc", "::golem_wasm_rpc::protobuf")
.type_attribute(
".",
"golem.worker.LogEvent",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.type_attribute(
"golem.worker.LogEvent.event",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.type_attribute(
"golem.worker.StdOutLog",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.type_attribute(
"golem.worker.StdErrLog",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.type_attribute(
"golem.worker.Level",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.type_attribute(
"golem.worker.Log",
"#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
)
.include_file("mod.rs")
Expand Down Expand Up @@ -52,6 +72,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"proto/golem/worker/worker_error.proto",
"proto/golem/worker/worker_id.proto",
"proto/golem/worker/worker_metadata.proto",
"proto/golem/worker/worker_filter.proto",
"proto/golem/worker/worker_status.proto",
"proto/golem/worker/worker_service.proto",
"proto/golem/workerexecutor/worker_executor.proto",
Expand Down
12 changes: 12 additions & 0 deletions golem-api-grpc/proto/golem/common/filter_comparator.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
syntax = "proto3";

package golem.common;

enum FilterComparator {
EQUAL = 0;
NOT_EQUAL = 1;
LESS = 2;
LESS_EQUAL = 3;
GREATER = 4;
GREATER_EQUAL = 5;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package golem.common;


enum StringFilterComparator {
STRING_EQUAL = 0;
STRING_LIKE = 1;
}
60 changes: 60 additions & 0 deletions golem-api-grpc/proto/golem/worker/worker_filter.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
syntax = "proto3";

package golem.worker;

import "golem/common/account_id.proto";
import "golem/common/string_filter_comparator.proto";
import "golem/common/filter_comparator.proto";
import "golem/worker/worker_id.proto";
import "golem/worker/worker_status.proto";
import "google/protobuf/timestamp.proto";

message WorkerFilter {
oneof filter {
WorkerNameFilter name = 1;
WorkerVersionFilter version = 2;
WorkerStatusFilter status = 3;
WorkerCreatedAtFilter created_at = 4;
WorkerEnvFilter env = 5;
WorkerAndFilter and = 6;
WorkerOrFilter or = 7;
WorkerNotFilter not = 8;
}
}

message WorkerNotFilter {
WorkerFilter filter = 1;
}

message WorkerAndFilter {
repeated WorkerFilter filters = 1;
}

message WorkerOrFilter {
repeated WorkerFilter filters = 1;
}

message WorkerNameFilter {
golem.common.StringFilterComparator comparator = 1;
string value = 2;
}

message WorkerVersionFilter {
golem.common.FilterComparator comparator = 1;
int32 value = 2;
}

message WorkerCreatedAtFilter {
golem.common.FilterComparator comparator = 1;
google.protobuf.Timestamp value = 2;
}

message WorkerStatusFilter {
WorkerStatus value = 1;
}

message WorkerEnvFilter {
string name = 1;
golem.common.StringFilterComparator comparator = 2;
string value = 3;
}
41 changes: 41 additions & 0 deletions golem-api-grpc/proto/golem/workerexecutor/worker_executor.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import public "golem/template/template_id.proto";
import public "golem/worker/worker_id.proto";
import public "golem/worker/worker_metadata.proto";
import public "golem/worker/worker_status.proto";
import public "golem/worker/worker_filter.proto";
import public "golem/worker/worker_execution_error.proto";
import public "wasm/rpc/val.proto";

Expand All @@ -30,6 +31,8 @@ service WorkerExecutor {
rpc AssignShards(AssignShardsRequest) returns (AssignShardsResponse);
rpc GetWorkerMetadata(golem.worker.WorkerId) returns (GetWorkerMetadataResponse);
rpc ResumeWorker(ResumeWorkerRequest) returns (ResumeWorkerResponse);
rpc GetRunningWorkerMetadatas(GetRunningWorkerMetadatasRequest) returns (GetRunningWorkerMetadatasResponse);
rpc GetWorkerMetadatas(GetWorkerMetadatasRequest) returns (GetWorkerMetadatasResponse);
}

message InvokeWorkerResponse {
Expand Down Expand Up @@ -179,3 +182,41 @@ message ResumeWorkerResponse {
golem.worker.WorkerExecutionError failure = 2;
}
}

message GetRunningWorkerMetadatasRequest {
golem.template.TemplateId template_id = 1;
golem.worker.WorkerFilter filter = 2;
}


message GetRunningWorkerMetadatasResponse {
oneof result {
GetRunningWorkerMetadatasSuccessResponse success = 1;
golem.worker.WorkerExecutionError failure = 2;
}
}

message GetRunningWorkerMetadatasSuccessResponse {
repeated golem.worker.WorkerMetadata workers = 1;
}

message GetWorkerMetadatasRequest {
golem.template.TemplateId template_id = 1;
golem.worker.WorkerFilter filter = 2;
uint64 cursor = 3;
uint64 count = 4;
bool precise = 5;
}


message GetWorkerMetadatasResponse {
oneof result {
GetWorkerMetadatasSuccessResponse success = 1;
golem.worker.WorkerExecutionError failure = 2;
}
}

message GetWorkerMetadatasSuccessResponse {
repeated golem.worker.WorkerMetadata workers = 1;
uint64 cursor = 2;
}
1 change: 1 addition & 0 deletions golem-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ poem = { workspace = true }
poem-openapi = { workspace = true }
prometheus = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
rand = "0.8.5"
range-set-blaze = "0.1.16"
serde = { workspace = true }
Expand Down
Loading
Loading