Skip to content
Closed
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
4 changes: 3 additions & 1 deletion packages/core/services/cluster/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ pub struct Server {
pub state: ServerState,
}

#[derive(Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromRepr)]
#[derive(
Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromRepr,
)]
pub enum ServerState {
Provisioning = 0,
Installing = 1,
Expand Down
20 changes: 14 additions & 6 deletions packages/core/services/cluster/src/workflows/datacenter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,21 @@ pub(crate) async fn cluster_datacenter(ctx: &mut WorkflowCtx, input: &Input) ->
};

match ctx.check_version(2).await? {
1 => ctx.activity(v1).await?,
1 => {
// We remove here because the hash doesn't calculate correctly anymore
ctx.removed::<Activity<InsertDb>>().await?;
}
2 => {
// We remove here because the hash doesn't calculate correctly anymore
ctx.removed::<Activity<InsertDbV2>>().await?;
}
_latest => {
ctx.activity(InsertDbInputV2 {
v1,
guard_public_hostname: input.guard_public_hostname.clone(),
})
.await?
ctx.v(3)
.activity(InsertDbInputV2 {
v1,
guard_public_hostname: input.guard_public_hostname.clone(),
})
.await?
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,3 @@ pub fn configure(namespace: &str, config: &Config, pool_type: PoolType) -> Globa

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

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use foundationdb::{
};
use futures_util::{FutureExt, TryStreamExt};
use sqlx::Acquire;
use util::serde::AsHashableExt;

use super::{
destroy::{self, KillCtx},
Expand Down
3 changes: 1 addition & 2 deletions packages/edge/services/pegboard/src/workflows/actor/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ use cluster::types::BuildDeliveryMethod;
use fdb_util::FormalKey;
use foundationdb as fdb;
use sqlx::Acquire;
use util::serde::AsHashableExt;

use super::{analytics::InsertClickHouseInput, Input, Port};
use super::{Input, Port};
use crate::{
keys, protocol,
types::{ActorLifecycle, ActorResources, GameGuardProtocol, NetworkMode, Routing},
Expand Down
Loading