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
30 changes: 4 additions & 26 deletions Cargo.lock

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

5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[workspace]
resolver = "2"
members = ["packages/common/api-builder","packages/common/api-client","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/udb-util","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner-ws","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]
members = ["packages/common/api-builder","packages/common/api-client","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner-ws","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]

[workspace.package]
version = "25.6.1"
Expand Down Expand Up @@ -318,9 +318,6 @@ path = "packages/common/test-deps-docker"
[workspace.dependencies.rivet-types]
path = "packages/common/types"

[workspace.dependencies.udb-util]
path = "packages/common/udb-util"

[workspace.dependencies.universaldb]
path = "packages/common/universaldb"

Expand Down
1 change: 0 additions & 1 deletion packages/common/gasoline/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ tokio-util.workspace = true
tokio.workspace = true
tracing-logfmt.workspace = true
tracing-opentelemetry.workspace = true
udb-util.workspace = true
universaldb.workspace = true
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tracing.workspace = true
Expand Down
57 changes: 29 additions & 28 deletions packages/common/gasoline/core/src/ctx/workflow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -671,34 +671,35 @@ impl WorkflowCtx {
exec.execute(self).await
}

/// Tests if the given error is unrecoverable. If it is, allows the user to run recovery code safely.
/// Should always be used when trying to handle activity errors manually.
#[tracing::instrument(skip_all)]
pub fn catch_unrecoverable<T>(&mut self, res: Result<T>) -> Result<Result<T>> {
match res {
Err(err) => {
// TODO: This should check .chain() for the error
match err.downcast::<WorkflowError>() {
Ok(inner_err) => {
// Despite "history diverged" errors being unrecoverable, they should not have be returned
// by this function because the state of the history is already messed up and no new
// workflow items should be run.
if !inner_err.is_recoverable()
&& !matches!(inner_err, WorkflowError::HistoryDiverged(_))
{
self.cursor.inc();

Ok(Err(inner_err.into()))
} else {
Err(inner_err.into())
}
}
Err(err) => Err(err),
}
}
Ok(x) => Ok(Ok(x)),
}
}
// TODO: Replace with some method on WorkflowError
// /// Tests if the given error is unrecoverable. If it is, allows the user to run recovery code safely.
// /// Should always be used when trying to handle activity errors manually.
// #[tracing::instrument(skip_all)]
// pub fn catch_unrecoverable<T>(&mut self, res: Result<T>) -> Result<Result<T>> {
// match res {
// Err(err) => {
// // TODO: This should check .chain() for the error
// match err.downcast::<WorkflowError>() {
// Ok(inner_err) => {
// // Despite "history diverged" errors being unrecoverable, they should not have be returned
// // by this function because the state of the history is already messed up and no new
// // workflow items should be run.
// if !inner_err.is_recoverable()
// && !matches!(inner_err, WorkflowError::HistoryDiverged(_))
// {
// self.cursor.inc();

// Ok(Err(inner_err.into()))
// } else {
// Err(inner_err.into())
// }
// }
// Err(err) => Err(err),
// }
// }
// Ok(x) => Ok(Ok(x)),
// }
// }

/// Creates a signal builder.
pub fn signal<T: Signal + Serialize>(&mut self, body: T) -> builder::signal::SignalBuilder<T> {
Expand Down
Loading
Loading