Skip to content

Commit

Permalink
[package] Destroy datasets as a part of uninstallation
Browse files Browse the repository at this point in the history
Major changes:
- Uninstallation now collects all Zpool and Zone based datasets,
prompts the user, and destroys them during the uninstall process.
- Adds a "-f / --force" option to "omicron-package", allowing
callers to skip the new confirmation prompt.
- Adds a "deactivate" command to "omicron-package". This allows
callers to remove Zones and disable services, but does not delete
durable configurations and storage. A caller should be able to
call "deactivate" -> "activate" -> "deactivate" repeatedly without
losing durable state.

Minor changes:
- Updates documentation for omicron-package
- Improves handling of addresses deleted from
  `cleanup_networking_resources`, especially in cases of duplicates
- Rename "filesystem" to "dataset" in functions where it's more
  appropriate to be generic in the context of ZFS.

Fixes #1884

Part of #1119
Part of #1313
  • Loading branch information
smklein committed Oct 30, 2022
1 parent bbaa11f commit 29bbfc2
Show file tree
Hide file tree
Showing 7 changed files with 242 additions and 63 deletions.
136 changes: 115 additions & 21 deletions package/src/bin/omicron-package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use futures::stream::{self, StreamExt, TryStreamExt};
use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
use omicron_package::{parse, BuildCommand, DeployCommand};
use omicron_sled_agent::cleanup_networking_resources;
use omicron_sled_agent::zone;
use omicron_sled_agent::{zfs, zone, zpool};
use omicron_zone_package::config::Config as PackageConfig;
use omicron_zone_package::package::{Package, PackageOutput, PackageSource};
use omicron_zone_package::progress::Progress;
Expand All @@ -24,6 +24,7 @@ use slog::Drain;
use slog::Logger;
use std::env;
use std::fs::create_dir_all;
use std::io::Write;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use tokio::io::{AsyncReadExt, AsyncWriteExt, BufReader};
Expand Down Expand Up @@ -71,6 +72,15 @@ struct Args {
)]
target: Target,

#[clap(
short,
long,
help = "Skip confirmation prompt for destructive operations",
action,
default_value_t = false
)]
force: bool,

#[clap(subcommand)]
subcommand: SubCommand,
}
Expand Down Expand Up @@ -311,7 +321,7 @@ async fn do_package(config: &Config, output_directory: &Path) -> Result<()> {
Ok(())
}

fn do_unpack(
async fn do_unpack(
config: &Config,
artifact_dir: &Path,
install_dir: &Path,
Expand All @@ -335,15 +345,20 @@ fn do_unpack(
"src" => %src.to_string_lossy(),
"dst" => %dst.to_string_lossy(),
);
std::fs::copy(&src, &dst)?;
std::fs::copy(&src, &dst).map_err(|err| {
anyhow!(
"Failed to copy {src} to {dst}: {err}",
src = src.display(),
dst = dst.display()
)
})?;
Ok(())
},
)?;

if env::var("OMICRON_NO_UNINSTALL").is_err() {
// Ensure we start from a clean slate - remove all zones & packages.
uninstall_all_packages(config);
uninstall_all_omicron_zones()?;
do_uninstall(config).await?;
}

// Extract all global zone services.
Expand Down Expand Up @@ -395,12 +410,12 @@ fn do_activate(config: &Config, install_dir: &Path) -> Result<()> {
Ok(())
}

fn do_install(
async fn do_install(
config: &Config,
artifact_dir: &Path,
install_dir: &Path,
) -> Result<()> {
do_unpack(config, artifact_dir, install_dir)?;
do_unpack(config, artifact_dir, install_dir).await?;
do_activate(config, install_dir)
}

Expand All @@ -412,6 +427,46 @@ fn uninstall_all_omicron_zones() -> Result<()> {
Ok(())
}

fn get_all_omicron_datasets() -> Result<Vec<String>> {
let mut datasets = vec![];

// Collect all datasets within Oxide zpools.
//
// This includes cockroachdb, clickhouse, and crucible datasets.
let zpools = zpool::Zpool::list()?;
for pool in &zpools {
let pool = pool.to_string();
for dataset in &zfs::Zfs::list_datasets(&pool)? {
datasets.push(format!("{pool}/{dataset}"));
}
}

// Collect all datasets for Oxide zones.
for dataset in &zfs::Zfs::list_datasets(&zfs::ZONE_ZFS_DATASET)? {
datasets.push(format!("{}/{dataset}", zfs::ZONE_ZFS_DATASET));
}

Ok(datasets)
}

fn uninstall_all_omicron_datasets(config: &Config) -> Result<()> {
let datasets = get_all_omicron_datasets()?;
if datasets.is_empty() {
return Ok(());
}

config.confirm(&format!(
"About to delete the following datasets: {:#?}",
datasets
))?;
for dataset in &datasets {
info!(config.log, "Deleting dataset: {dataset}");
zfs::Zfs::destroy_dataset(dataset)?;
}

Ok(())
}

// Attempts to both disable and delete all requested packages.
fn uninstall_all_packages(config: &Config) {
for (_, package) in config
Expand All @@ -426,7 +481,9 @@ fn uninstall_all_packages(config: &Config) {
.run(smf::AdmSelection::ByPattern(&[&package.service_name]));
let _ = smf::Config::delete().force().run(&package.service_name);
}
}

fn uninstall_omicron_config() {
// Once all packages have been removed, also remove any locally-stored
// configuration.
remove_all_unless_already_removed(omicron_common::OMICRON_CONFIG_PATH)
Expand Down Expand Up @@ -479,7 +536,7 @@ fn remove_all_except<P: AsRef<Path>>(
Ok(())
}

async fn do_uninstall(config: &Config) -> Result<()> {
async fn do_deactivate(config: &Config) -> Result<()> {
info!(&config.log, "Removing all Omicron zones");
uninstall_all_omicron_zones()?;
info!(config.log, "Uninstalling all packages");
Expand All @@ -489,11 +546,21 @@ async fn do_uninstall(config: &Config) -> Result<()> {
Ok(())
}

async fn do_uninstall(config: &Config) -> Result<()> {
do_deactivate(config).await?;
info!(config.log, "Uninstalling Omicron configuration");
uninstall_omicron_config();
info!(config.log, "Removing datasets");
uninstall_all_omicron_datasets(config)?;
Ok(())
}

async fn do_clean(
config: &Config,
artifact_dir: &Path,
install_dir: &Path,
) -> Result<()> {
do_uninstall(&config).await?;
info!(
config.log,
"Removing artifacts from {}",
Expand Down Expand Up @@ -590,6 +657,27 @@ struct Config {
package_config: PackageConfig,
// Description of the target we're trying to operate on.
target: Target,
// True if we should skip confirmations for destructive operations.
force: bool,
}

impl Config {
/// Prompts the user for input before proceeding with an operation.
fn confirm(&self, prompt: &str) -> Result<()> {
if self.force {
return Ok(());
}

print!("{prompt}\n[yY to confirm] >> ");
let _ = std::io::stdout().flush();

let mut input = String::new();
std::io::stdin().read_line(&mut input)?;
match input.as_str().trim() {
"y" | "Y" => Ok(()),
_ => bail!("Aborting"),
}
}
}

#[tokio::main]
Expand All @@ -604,8 +692,12 @@ async fn main() -> Result<()> {

debug!(log, "target: {:?}", args.target);

let config =
Config { log: log.clone(), package_config, target: args.target };
let config = Config {
log: log.clone(),
package_config,
target: args.target,
force: args.force,
};

// Use a CWD that is the root of the Omicron repository.
if let Ok(manifest) = env::var("CARGO_MANIFEST_DIR") {
Expand All @@ -623,26 +715,28 @@ async fn main() -> Result<()> {
artifact_dir,
install_dir,
}) => {
do_install(&config, &artifact_dir, &install_dir)?;
}
SubCommand::Deploy(DeployCommand::Uninstall) => {
do_uninstall(&config).await?;
do_install(&config, &artifact_dir, &install_dir).await?;
}
SubCommand::Deploy(DeployCommand::Clean {
SubCommand::Deploy(DeployCommand::Unpack {
artifact_dir,
install_dir,
}) => {
do_unpack(&config, &artifact_dir, &install_dir).await?;
}
SubCommand::Deploy(DeployCommand::Activate { install_dir }) => {
do_activate(&config, &install_dir)?;
}
SubCommand::Deploy(DeployCommand::Deactivate) => {
do_deactivate(&config).await?;
}
SubCommand::Deploy(DeployCommand::Uninstall) => {
do_uninstall(&config).await?;
do_clean(&config, &artifact_dir, &install_dir).await?;
}
SubCommand::Deploy(DeployCommand::Unpack {
SubCommand::Deploy(DeployCommand::Clean {
artifact_dir,
install_dir,
}) => {
do_unpack(&config, &artifact_dir, &install_dir)?;
}
SubCommand::Deploy(DeployCommand::Activate { install_dir }) => {
do_activate(&config, &install_dir)?;
do_clean(&config, &artifact_dir, &install_dir).await?;
}
}

Expand Down
70 changes: 46 additions & 24 deletions package/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,24 @@ pub fn parse<P: AsRef<Path>, C: DeserializeOwned>(
/// Commands which should execute on a host building packages.
#[derive(Debug, Subcommand)]
pub enum BuildCommand {
/// Builds the packages specified in a manifest, and places them into a target
/// directory.
/// Builds the packages specified in a manifest, and places them into an
/// 'out' directory.
Package {
/// The output directory, where artifacts should be placed.
///
/// Defaults to "out".
#[clap(long = "out", default_value = "out", action)]
artifact_dir: PathBuf,
},
/// Checks the packages specified in a manifest, without building.
/// Checks the packages specified in a manifest, without building them.
Check,
}

/// Commands which should execute on a host installing packages.
#[derive(Debug, Subcommand)]
pub enum DeployCommand {
/// Installs the packages to a target machine and starts the sled-agent
///
/// This is a combination of `Unpack` and `Activate`
/// Installs the packages and starts the sled-agent. Shortcut for `unpack`
/// and `activate`.
Install {
/// The directory from which artifacts will be pulled.
///
Expand All @@ -62,40 +61,63 @@ pub enum DeployCommand {
#[clap(long = "out", default_value = "/opt/oxide", action)]
install_dir: PathBuf,
},
/// Uninstalls the packages from the target machine.
Uninstall,
/// Uninstalls and removes the packages from the target machine.
Clean {
/// The directory from which artifacts were be pulled.
/// Unpacks the files created by `package` to an install directory.
/// Issues the `uninstall` command.
///
/// This command performs uninstallation by default as a safety measure,
/// to ensure that we are not swapping packages underneath running services,
/// which may result in unexpected behavior.
/// The "uninstall before unpack" behavior can be disabled by setting
/// the environment variable OMICRON_NO_INSTALL.
///
/// `unpack` does not actually start any services, but it prepares services
/// to be launched with the `activate` command.
Unpack {
/// The directory from which artifacts will be pulled.
///
/// Should match the format from the Package subcommand.
#[clap(long = "in", default_value = "out", action)]
artifact_dir: PathBuf,

/// The directory to which artifacts were installed.
/// The directory to which artifacts will be installed.
///
/// Defaults to "/opt/oxide".
#[clap(long = "out", default_value = "/opt/oxide", action)]
install_dir: PathBuf,
},

/// Unpacks the package files on the target machine
Unpack {
/// The directory from which artifacts will be pulled.
///
/// Should match the format from the Package subcommand.
#[clap(long = "in", default_value = "out", action)]
artifact_dir: PathBuf,

/// Imports and starts the sled-agent illumos service
///
/// The necessary packages must exist in the installation directory
/// already; this can be done with the `unpack` command.
Activate {
/// The directory to which artifacts will be installed.
///
/// Defaults to "/opt/oxide".
#[clap(long = "out", default_value = "/opt/oxide", action)]
install_dir: PathBuf,
},
/// Installs the sled-agent illumos service and starts it
Activate {
/// The directory to which artifacts will be installed.
/// Deletes all Omicron zones and stops all services.
///
/// This command may be used to stop the currently executing Omicron
/// services, such that they could be restarted later.
Deactivate,
/// Uninstalls packages and deletes durable Omicron storage. Issues the
/// `deactivate` command.
///
/// This command deletes all state used by Omicron services, but leaves
/// the packages in the installation directory. This means that a later
/// call to `activate` could re-install Omicron services.
Uninstall,
/// Uninstalls packages and removes them from the installation directory.
/// Issues the `uninstall` command.
Clean {
/// The directory from which artifacts were be pulled.
///
/// Should match the format from the Package subcommand.
#[clap(long = "in", default_value = "out", action)]
artifact_dir: PathBuf,

/// The directory to which artifacts were installed.
///
/// Defaults to "/opt/oxide".
#[clap(long = "out", default_value = "/opt/oxide", action)]
Expand Down
Loading

0 comments on commit 29bbfc2

Please sign in to comment.