Skip to content

Commit

Permalink
fix(ds): add back runc cleanup (#1172)
Browse files Browse the repository at this point in the history 
<!-- Please make sure there is an issue that this PR is correlated to. -->
**Not manually tested**

Fixes RVTEE-230
## Changes

<!-- If there are frontend changes, please include screenshots. -->
  • Loading branch information
@MasterPtato
MasterPtato committed Sep 28, 2024
1 parent f07b095 commit 8e08889
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 58 deletions.
56 changes: 29 additions & 27 deletions lib/bolt/core/src/context/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,33 +510,35 @@ impl ServiceContextData {
);
}

let can_depend =
if self.is_monolith_worker() {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::Consumer { .. }
)
} else if matches!(self.config().kind, ServiceKind::Api { .. }) {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::ApiRoutes { .. }
| ServiceKind::Consumer { .. }
)
} else {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::Consumer { .. }
)
};
let can_depend = if self.is_monolith_worker() {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. }
| ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::Consumer { .. }
)
} else if matches!(self.config().kind, ServiceKind::Api { .. }) {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. }
| ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::ApiRoutes { .. }
| ServiceKind::Consumer { .. }
)
} else {
matches!(
dep.config().kind,
ServiceKind::Database { .. }
| ServiceKind::Cache { .. }
| ServiceKind::Operation { .. }
| ServiceKind::Package { .. }
| ServiceKind::Consumer { .. }
)
};

if !can_depend {
panic!(
Expand Down
63 changes: 32 additions & 31 deletions svc/pkg/ds/src/workflows/server/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::{
escape_go_template, gen_oci_bundle_config, inject_consul_env_template,
nomad_host_port_env_var, template_env_var_int, DecodedPort, TransportProtocol,
},
NOMAD_CONFIG, NOMAD_REGION,
NOMAD_CONFIG, NOMAD_REGION, RUNC_CLEANUP_CPU, RUNC_CLEANUP_MEMORY,
},
};

Expand All @@ -40,6 +40,7 @@ const SETUP_SCRIPT: &str = include_str!("./scripts/setup.sh");
const SETUP_JOB_RUNNER_SCRIPT: &str = include_str!("./scripts/setup_job_runner.sh");
const SETUP_OCI_BUNDLE_SCRIPT: &str = include_str!("./scripts/setup_oci_bundle.sh");
const SETUP_CNI_NETWORK_SCRIPT: &str = include_str!("./scripts/setup_cni_network.sh");
const CLEANUP_SCRIPT: &str = include_str!("./scripts/cleanup.sh");

#[derive(Default, Clone)]
struct GameGuardUnnest {
Expand Down Expand Up @@ -831,36 +832,36 @@ async fn submit_job(ctx: &ActivityCtx, input: &SubmitJobInput) -> GlobalResult<S
})),
..Task::new()
},
// TODO: Remove
// Task {
// name: Some("runc-cleanup".into()),
// lifecycle: Some(Box::new(TaskLifecycle {
// hook: Some("poststop".into()),
// sidecar: Some(false),
// })),
// driver: Some("raw_exec".into()),
// config: Some({
// let mut x = HashMap::new();
// x.insert("command".into(), json!("${NOMAD_TASK_DIR}/cleanup.sh"));
// x
// }),
// templates: Some(vec![Template {
// embedded_tmpl: Some(CLEANUP_SCRIPT.into()),
// dest_path: Some("${NOMAD_TASK_DIR}/cleanup.sh".into()),
// perms: Some("744".into()),
// ..Template::new()
// }]),
// resources: Some(Box::new(Resources {
// CPU: Some(util_mm::RUNC_CLEANUP_CPU),
// memory_mb: Some(util_mm::RUNC_CLEANUP_MEMORY),
// ..Resources::new()
// })),
// log_config: Some(Box::new(LogConfig {
// max_files: Some(4),
// max_file_size_mb: Some(2),
// })),
// ..Task::new()
// },
Task {
name: Some("runc-cleanup".into()),
lifecycle: Some(Box::new(TaskLifecycle {
hook: Some("poststop".into()),
sidecar: Some(false),
})),
driver: Some("raw_exec".into()),
config: Some({
let mut x = HashMap::new();
x.insert("command".into(), json!("${NOMAD_TASK_DIR}/cleanup.sh"));
x
}),
templates: Some(vec![Template {
embedded_tmpl: Some(CLEANUP_SCRIPT.into()),
dest_path: Some("${NOMAD_TASK_DIR}/cleanup.sh".into()),
perms: Some("744".into()),
..Template::new()
}]),
resources: Some(Box::new(Resources {
CPU: Some(RUNC_CLEANUP_CPU),
memory_mb: Some(RUNC_CLEANUP_MEMORY),
..Resources::new()
})),
log_config: Some(Box::new(LogConfig {
max_files: Some(4),
max_file_size_mb: Some(2),
disabled: None,
})),
..Task::new()
},
// Run cleanup task
Task {
name: Some(util_job::RUN_CLEANUP_TASK_NAME.into()),
Expand Down

0 comments on commit 8e08889

Please sign in to comment.