Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily disable region snapshot replacement #6728

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Temporarily disable region snapshot replacement #6728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f10635
Temporarily disable region snapshot replacement
jmpesp Sep 30, 2024
93fe946
actually disable it!
jmpesp Sep 30, 2024
e0efa1b
reference issue
jmpesp Sep 30, 2024
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
32 changes: 20 additions & 12 deletions nexus/src/app/background/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,8 @@ impl BackgroundTasksInitializer {
"detect if region snapshots need replacement and begin the \
process",
period: config.region_snapshot_replacement_start.period_secs,
task_impl: Box::new(RegionSnapshotReplacementDetector::new(
// XXX temporarily disabled, see oxidecomputer/omicron#6353
task_impl: Box::new(RegionSnapshotReplacementDetector::disabled(
datastore.clone(),
sagas.clone(),
)),
Expand All @@ -794,10 +795,13 @@ impl BackgroundTasksInitializer {
period: config
.region_snapshot_replacement_garbage_collection
.period_secs,
task_impl: Box::new(RegionSnapshotReplacementGarbageCollect::new(
datastore.clone(),
sagas.clone(),
)),
// XXX temporarily disabled, see oxidecomputer/omicron#6353
task_impl: Box::new(
RegionSnapshotReplacementGarbageCollect::disabled(
datastore.clone(),
sagas.clone(),
),
),
opctx: opctx.child(BTreeMap::new()),
watchers: vec![],
activator: task_region_snapshot_replacement_garbage_collection,
Expand All @@ -809,10 +813,13 @@ impl BackgroundTasksInitializer {
"detect what volumes were affected by a region snapshot \
replacement, and run the step saga for them",
period: config.region_snapshot_replacement_step.period_secs,
task_impl: Box::new(RegionSnapshotReplacementFindAffected::new(
datastore.clone(),
sagas.clone(),
)),
// XXX temporarily disabled, see oxidecomputer/omicron#6353
task_impl: Box::new(
RegionSnapshotReplacementFindAffected::disabled(
datastore.clone(),
sagas.clone(),
),
),
opctx: opctx.child(BTreeMap::new()),
watchers: vec![],
activator: task_region_snapshot_replacement_step,
Expand All @@ -824,9 +831,10 @@ impl BackgroundTasksInitializer {
"complete a region snapshot replacement if all the steps are \
done",
period: config.region_snapshot_replacement_finish.period_secs,
task_impl: Box::new(RegionSnapshotReplacementFinishDetector::new(
datastore,
)),
// XXX temporarily disabled, see oxidecomputer/omicron#6353
task_impl: Box::new(
RegionSnapshotReplacementFinishDetector::disabled(datastore),
),
opctx: opctx.child(BTreeMap::new()),
watchers: vec![],
activator: task_region_snapshot_replacement_finish,
Expand Down
12 changes: 11 additions & 1 deletion nexus/src/app/background/tasks/region_snapshot_replacement_finish.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@ use std::sync::Arc;

pub struct RegionSnapshotReplacementFinishDetector {
datastore: Arc<DataStore>,
disabled: bool,
}

impl RegionSnapshotReplacementFinishDetector {
#[allow(dead_code)]
pub fn new(datastore: Arc<DataStore>) -> Self {
RegionSnapshotReplacementFinishDetector { datastore }
RegionSnapshotReplacementFinishDetector { datastore, disabled: false }
}

pub fn disabled(datastore: Arc<DataStore>) -> Self {
RegionSnapshotReplacementFinishDetector { datastore, disabled: true }
}

async fn transition_requests_to_done(
Expand Down Expand Up @@ -153,6 +159,10 @@ impl BackgroundTask for RegionSnapshotReplacementFinishDetector {
async move {
let mut status = RegionSnapshotReplacementFinishStatus::default();

if self.disabled {
return json!(status);
}

self.transition_requests_to_done(opctx, &mut status).await;

json!(status)
Expand Down
23 changes: 22 additions & 1 deletion nexus/src/app/background/tasks/region_snapshot_replacement_garbage_collect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,28 @@ use std::sync::Arc;
pub struct RegionSnapshotReplacementGarbageCollect {
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
disabled: bool,
}

impl RegionSnapshotReplacementGarbageCollect {
#[allow(dead_code)]
pub fn new(datastore: Arc<DataStore>, sagas: Arc<dyn StartSaga>) -> Self {
RegionSnapshotReplacementGarbageCollect { datastore, sagas }
RegionSnapshotReplacementGarbageCollect {
datastore,
sagas,
disabled: false,
}
}

pub fn disabled(
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
) -> Self {
RegionSnapshotReplacementGarbageCollect {
datastore,
sagas,
disabled: true,
}
}

async fn send_garbage_collect_request(
Expand Down Expand Up @@ -135,6 +152,10 @@ impl BackgroundTask for RegionSnapshotReplacementGarbageCollect {
let mut status =
RegionSnapshotReplacementGarbageCollectStatus::default();

if self.disabled {
return json!(status);
}

self.clean_up_region_snapshot_replacement_volumes(
opctx,
&mut status,
Expand Down
15 changes: 14 additions & 1 deletion nexus/src/app/background/tasks/region_snapshot_replacement_start.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,20 @@ use std::sync::Arc;
pub struct RegionSnapshotReplacementDetector {
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
disabled: bool,
}

impl RegionSnapshotReplacementDetector {
#[allow(dead_code)]
pub fn new(datastore: Arc<DataStore>, sagas: Arc<dyn StartSaga>) -> Self {
RegionSnapshotReplacementDetector { datastore, sagas }
RegionSnapshotReplacementDetector { datastore, sagas, disabled: false }
}

pub fn disabled(
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
) -> Self {
RegionSnapshotReplacementDetector { datastore, sagas, disabled: true }
}

async fn send_start_request(
Expand Down Expand Up @@ -237,6 +246,10 @@ impl BackgroundTask for RegionSnapshotReplacementDetector {
async {
let mut status = RegionSnapshotReplacementStartStatus::default();

if self.disabled {
return json!(status);
}

self.create_requests_for_region_snapshots_on_expunged_disks(
opctx,
&mut status,
Expand Down
23 changes: 22 additions & 1 deletion nexus/src/app/background/tasks/region_snapshot_replacement_step.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,28 @@ use std::sync::Arc;
pub struct RegionSnapshotReplacementFindAffected {
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
disabled: bool,
}

impl RegionSnapshotReplacementFindAffected {
#[allow(dead_code)]
pub fn new(datastore: Arc<DataStore>, sagas: Arc<dyn StartSaga>) -> Self {
RegionSnapshotReplacementFindAffected { datastore, sagas }
RegionSnapshotReplacementFindAffected {
datastore,
sagas,
disabled: false,
}
}

pub fn disabled(
datastore: Arc<DataStore>,
sagas: Arc<dyn StartSaga>,
) -> Self {
RegionSnapshotReplacementFindAffected {
datastore,
sagas,
disabled: true,
}
}

async fn send_start_request(
Expand Down Expand Up @@ -435,6 +452,10 @@ impl BackgroundTask for RegionSnapshotReplacementFindAffected {
async move {
let mut status = RegionSnapshotReplacementStepStatus::default();

if self.disabled {
return json!(status);
}

// Importantly, clean old steps up before finding affected volumes!
// Otherwise, will continue to find the snapshot in volumes to
// delete, and will continue to see conflicts in next function.
Expand Down
Loading