Skip to content

Commit 0d2ca27

Browse files
committed
chore: fix dc wf
1 parent b43c653 commit 0d2ca27

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

packages/core/services/cluster/src/types.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ pub struct Server {
157157
pub state: ServerState,
158158
}
159159

160-
#[derive(Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromRepr)]
160+
#[derive(
161+
Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromRepr,
162+
)]
161163
pub enum ServerState {
162164
Provisioning = 0,
163165
Installing = 1,

packages/core/services/cluster/src/workflows/datacenter/mod.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,21 @@ pub(crate) async fn cluster_datacenter(ctx: &mut WorkflowCtx, input: &Input) ->
4747
};
4848

4949
match ctx.check_version(2).await? {
50-
1 => ctx.activity(v1).await?,
50+
1 => {
51+
// We remove here because the hash doesn't calculate correctly anymore
52+
ctx.removed::<Activity<InsertDb>>().await?;
53+
}
54+
2 => {
55+
// We remove here because the hash doesn't calculate correctly anymore
56+
ctx.removed::<Activity<InsertDbV2>>().await?;
57+
}
5158
_latest => {
52-
ctx.activity(InsertDbInputV2 {
53-
v1,
54-
guard_public_hostname: input.guard_public_hostname.clone(),
55-
})
56-
.await?
59+
ctx.v(3)
60+
.activity(InsertDbInputV2 {
61+
v1,
62+
guard_public_hostname: input.guard_public_hostname.clone(),
63+
})
64+
.await?
5765
}
5866
}
5967
}

packages/core/services/cluster/src/workflows/server/install/install_scripts/components/vector.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,3 @@ pub fn configure(namespace: &str, config: &Config, pool_type: PoolType) -> Globa
235235

236236
Ok(include_str!("../files/vector_configure.sh").replace("__VECTOR_CONFIG__", &config_str))
237237
}
238-

packages/edge/services/pegboard/src/workflows/actor/runtime.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use foundationdb::{
99
};
1010
use futures_util::{FutureExt, TryStreamExt};
1111
use sqlx::Acquire;
12-
use util::serde::AsHashableExt;
1312

1413
use super::{
1514
destroy::{self, KillCtx},

packages/edge/services/pegboard/src/workflows/actor/setup.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ use cluster::types::BuildDeliveryMethod;
44
use fdb_util::FormalKey;
55
use foundationdb as fdb;
66
use sqlx::Acquire;
7-
use util::serde::AsHashableExt;
87

9-
use super::{analytics::InsertClickHouseInput, Input, Port};
8+
use super::{Input, Port};
109
use crate::{
1110
keys, protocol,
1211
types::{ActorLifecycle, ActorResources, GameGuardProtocol, NetworkMode, Routing},

0 commit comments

Comments
 (0)