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
241 changes: 40 additions & 201 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ console = "0.16"
dirs = "6.0"
jiff = { version = "0.2", features = ["serde"] }
humansize = "2.1"
humantime = "2.3"
fundu = { version = "2.1.1", default-features = false, features = ["custom"] }
bytes = "1.11"
url = "2.5"
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ console.workspace = true
# Utilities
jiff.workspace = true
humansize.workspace = true
humantime.workspace = true
fundu.workspace = true
mime_guess.workspace = true
tempfile.workspace = true
glob.workspace = true
Expand Down
102 changes: 97 additions & 5 deletions crates/cli/src/commands/admin/replicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ use super::{get_admin_client, normalize_admin_alias};
use crate::exit_code::ExitCode;
use crate::output::Formatter;
use rc_core::admin::{
AdminApi, PeerSiteSpec, ReplicateEditStatus, SiteRemoveSpec, SiteReplicationInfo,
SiteReplicationPeer, SiteReplicationRepairApi, SiteReplicationRepairOperationStatus,
SiteReplicationRepairPreflight, SiteReplicationResyncOperation, SiteReplicationResyncStatus,
SiteStatusOptions, validate_site_replication_ca_bundle,
validate_site_replication_repair_operation_id, validate_site_replication_repair_token,
AdminApi, PeerSiteSpec, ReplicateEditStatus, SiteRemoveSpec, SiteRemoveV2Spec,
SiteReplicationInfo, SiteReplicationPeer, SiteReplicationRepairApi,
SiteReplicationRepairOperationStatus, SiteReplicationRepairPreflight,
SiteReplicationResyncOperation, SiteReplicationResyncStatus, SiteStatusOptions,
validate_site_replication_ca_bundle, validate_site_replication_repair_operation_id,
validate_site_replication_repair_token,
};
use rc_core::{AliasManager, Error};
use rc_s3::AdminClient;
Expand Down Expand Up @@ -247,6 +248,22 @@ pub struct RemoveArgs {
/// Remove all sites (dissolve the cluster)
#[arg(long)]
pub all: bool,

/// Permanently retire the selected remote sites through the durable v2 protocol
#[arg(long)]
pub force: bool,

/// Remote sites allowed to miss acknowledgements when dissolving all sites
#[arg(long = "decommissioned-site", requires_all = ["all", "force"])]
pub decommissioned_sites: Vec<String>,

/// Resume an exact durable removal operation
#[arg(long, requires = "force")]
pub operation_id: Option<String>,

/// Confirm permanent decommissioning
#[arg(long, requires = "force")]
pub yes: bool,
}

/// Execute a site replication subcommand
Expand Down Expand Up @@ -1581,11 +1598,86 @@ async fn execute_remove(args: RemoveArgs, formatter: &Formatter) -> ExitCode {
return ExitCode::UsageError;
}

if args.force && (!args.yes || (args.all && args.decommissioned_sites.is_empty())) {
formatter.error(
"Permanent decommissioning requires --yes; --all also requires --decommissioned-site",
);
return ExitCode::UsageError;
}

let client = match get_admin_client(&args.alias, formatter) {
Ok(c) => c,
Err(code) => return code,
};

if args.force {
let mut request = SiteRemoveV2Spec {
mode: "dry-run".to_string(),
sites: args.sites,
all: args.all,
decommissioned_sites: args.decommissioned_sites,
operation_id: args.operation_id,
preflight_token: None,
};
let preview = match client.site_replication_remove_v2(&request).await {
Ok(preview) => preview,
Err(err) => {
return emit_admin_error(formatter, &err, "site-replication-decommission", false);
}
};
if !formatter.is_json() {
formatter.println(&format!(
"Removal deployments: {}",
preview.removed_deployment_ids.join(", ")
));
formatter.println(&format!(
"Decommissioned deployments: {}",
preview.decommissioned_deployment_ids.join(", ")
));
formatter.println(&format!("Operation ID: {}", preview.operation_id));
}
request.mode = "execute".to_string();
request.operation_id = Some(preview.operation_id.clone());
request.preflight_token = Some(preview.preflight_token);
return match client.site_replication_remove_v2(&request).await {
Ok(result) => {
let complete = result.status == "success";
if formatter.is_json() {
formatter.json(&result);
} else {
formatter.println(&format!("Site decommissioning: {}", result.status));
formatter.println(&format!("Operation ID: {}", result.operation_id));
formatter
.println("Configuration cleanup is independent of object-version cleanup.");
for error in &result.errors {
formatter.error(error);
}
if !complete {
formatter.println("Resume with the same selectors and --operation-id.");
}
}
if complete {
ExitCode::Success
} else {
ExitCode::Conflict
}
}
Err(err) => {
let code = ExitCode::from_i32(err.exit_code()).unwrap_or(ExitCode::GeneralError);
let id = request.operation_id.as_deref().unwrap_or("unknown");
emit_admin_message_error(
formatter,
code,
"site-replication-decommission",
true,
format!(
"{err}; operation ID: {id}; inspect or resume with the same selectors and --operation-id {id}"
),
)
}
};
}

let spec = SiteRemoveSpec {
site_names: args.sites.clone(),
remove_all: args.all,
Expand Down
112 changes: 111 additions & 1 deletion crates/cli/src/commands/replicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2579,9 +2579,38 @@ fn validate_reset_id(reset_id: &str) -> Result<(), Error> {
}

fn parse_resync_duration(value: &str) -> Result<std::time::Duration, Error> {
let duration = humantime::parse_duration(value).map_err(|error| {
use fundu::{CustomDurationParser, CustomTimeUnit, Multiplier, TimeUnit::*};
let mut parser = CustomDurationParser::with_time_units(&[
CustomTimeUnit::with_default(NanoSecond, &["nanos", "nsec", "ns"]),
CustomTimeUnit::with_default(MicroSecond, &["usec", "us", "µs"]),
CustomTimeUnit::with_default(MilliSecond, &["millis", "msec", "ms"]),
CustomTimeUnit::with_default(Second, &["seconds", "second", "secs", "sec", "s"]),
CustomTimeUnit::with_default(Minute, &["minutes", "minute", "min", "mins", "m"]),
CustomTimeUnit::with_default(Hour, &["hours", "hour", "hr", "hrs", "h"]),
CustomTimeUnit::with_default(Day, &["days", "day", "d"]),
CustomTimeUnit::with_default(Week, &["weeks", "week", "wk", "wks", "w"]),
CustomTimeUnit::new(
Second,
&["months", "month", "M"],
Some(Multiplier(2_630_016, 0)),
),
CustomTimeUnit::with_default(Year, &["years", "year", "yr", "yrs", "y"]),
]);
parser
.allow_time_unit_delimiter(true)
.disable_exponent(true)
.parse_multiple(true, None);
if !resync_duration_components_have_units(value) {
return Err(Error::InvalidPath(
"--older-than requires an unsigned duration with a time unit".to_string(),
));
}
let parsed = parser.parse(value.trim()).map_err(|error| {
Error::InvalidPath(format!("Invalid --older-than duration '{value}': {error}"))
})?;
let duration: std::time::Duration = parsed
.try_into()
.map_err(|_| Error::InvalidPath("--older-than exceeds the duration range".to_string()))?;
if duration.is_zero() {
return Err(Error::InvalidPath(
"--older-than must be greater than zero".to_string(),
Expand All @@ -2595,6 +2624,58 @@ fn parse_resync_duration(value: &str) -> Result<std::time::Duration, Error> {
Ok(duration)
}

fn resync_duration_components_have_units(value: &str) -> bool {
let mut characters = value.trim().chars().peekable();
if characters.peek().is_none() {
return false;
}
while characters.peek().is_some() {
let mut digits = 0;
while characters.peek().is_some_and(char::is_ascii_digit) {
characters.next();
digits += 1;
}
if digits == 0 {
return false;
}
if characters.peek() == Some(&'.') {
characters.next();
let mut fraction = 0;
while characters.peek().is_some_and(char::is_ascii_digit) {
characters.next();
fraction += 1;
}
if fraction == 0 {
return false;
}
}
while characters
.peek()
.is_some_and(|character| character.is_whitespace())
{
characters.next();
}
let mut unit = 0;
while characters
.peek()
.is_some_and(|character| character.is_alphabetic() || *character == 'µ')
{
characters.next();
unit += 1;
}
if unit == 0 {
return false;
}
while characters
.peek()
.is_some_and(|character| character.is_whitespace())
{
characters.next();
}
}
true
}

// ==================== Helpers ====================

fn parse_bucket_path(path: &str) -> Result<(String, String), String> {
Expand Down Expand Up @@ -3528,6 +3609,35 @@ mod tests {
assert!(parse_resync_duration("9223372036854775808s").is_err());
}

#[test]
fn resync_duration_preserves_compound_units_aliases_and_month_length() {
for (input, expected) in [
(
"7d10h31s",
std::time::Duration::from_secs(7 * 86400 + 10 * 3600 + 31),
),
("2 hours 37 mins", std::time::Duration::from_secs(9420)),
("1month", std::time::Duration::from_secs(2_630_016)),
("4.2s", std::time::Duration::new(4, 200_000_000)),
("1usec 2ns", std::time::Duration::from_nanos(1002)),
] {
assert_eq!(parse_resync_duration(input).expect(input), expected);
}
for invalid in [
"123",
"1h 2",
"1 2h",
".3s",
"1.s",
"1e3s",
"+1h",
"1fortnight",
"1h,2m",
] {
assert!(parse_resync_duration(invalid).is_err(), "{invalid}");
}
}

#[test]
fn replication_v3_status_output_preserves_server_state() {
let target = status_target_output(ReplicationResyncTargetStatus {
Expand Down
Loading