Skip to content

Commit 055ebf9

Browse files
committed
Report which unknown message was received
1 parent 21c64b6 commit 055ebf9

File tree

5 files changed

+29
-4
lines changed

5 files changed

+29
-4
lines changed

compiler/base/orchestrator/Cargo.lock

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler/base/orchestrator/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ once_cell = { version = "1.18.0", default-features = false, features = ["std"] }
1515
serde = { version = "1.0", default-features = false, features = ["derive"] }
1616
serde_json = { version = "1.0.108", default-features = false, features = ["std"] }
1717
snafu = { version = "0.8.0", default-features = false, features = ["futures", "std"] }
18+
strum_macros = { version = "0.25.3", default-features = false }
1819
tokio = { version = "1.28", default-features = false, features = ["fs", "io-std", "io-util", "macros", "process", "rt", "time", "sync"] }
1920
tokio-stream = { version = "0.1.14", default-features = false }
2021
tokio-util = { version = "0.7.8", default-features = false, features = ["io", "io-util"] }

compiler/base/orchestrator/src/coordinator.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,10 @@ impl Container {
17731773
WorkerMessage::Error2(e) =>
17741774
return Err(e).context(WorkerSnafu),
17751775

1776-
_ => return UnexpectedMessageSnafu.fail(),
1776+
_ => {
1777+
let message = container_msg.as_ref();
1778+
return UnexpectedMessageSnafu { message }.fail()
1779+
},
17771780
}
17781781
},
17791782

@@ -2097,8 +2100,8 @@ pub enum SpawnCargoError {
20972100
#[snafu(display("The worker operation failed"))]
20982101
Worker { source: SerializedError2 },
20992102

2100-
#[snafu(display("Received an unexpected message"))]
2101-
UnexpectedMessage,
2103+
#[snafu(display("Received the unexpected message `{message}`"))]
2104+
UnexpectedMessage { message: String },
21022105

21032106
#[snafu(display("There are no more messages"))]
21042107
UnexpectedEndOfMessages,

compiler/base/orchestrator/src/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl_narrow_to_broad!(
4141
ExecuteCommand => ExecuteCommandRequest,
4242
);
4343

44-
#[derive(Debug, Serialize, Deserialize)]
44+
#[derive(Debug, Serialize, Deserialize, strum_macros::AsRefStr)]
4545
pub enum WorkerMessage {
4646
WriteFile(WriteFileResponse),
4747
DeleteFile(DeleteFileResponse),

ui/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)