Rebase

Created using spr 1.3.6-beta.1

Cargo.toml

@@ -21,7 +21,6 @@ members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/oxlog",
-    "dev-tools/thing-flinger",
     "dev-tools/xtask",
     "dns-server",
     "end-to-end-tests",
@@ -96,7 +95,6 @@ default-members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/oxlog",
-    "dev-tools/thing-flinger",
     # Do not include xtask in the list of default members, because this causes
     # hakari to not work as well and build times to be longer.
     # See omicron#4392.

bootstore/src/schemes/v0/peer.rs

@@ -62,6 +62,14 @@ pub enum NodeRequestError {
     },
 }
 
+impl From<NodeRequestError> for omicron_common::api::external::Error {
+    fn from(error: NodeRequestError) -> Self {
+        omicron_common::api::external::Error::internal_error(&format!(
+            "{error}"
+        ))
+    }
+}
+
 /// A request sent to the `Node` task from the `NodeHandle`
 pub enum NodeApiRequest {
     /// Initialize a rack at the behest of RSS running on the same scrimlet as

dev-tools/omdb/src/bin/omdb/sled_agent.rs

@@ -31,6 +31,10 @@ enum SledAgentCommands {
     /// print information about zpools
     #[clap(subcommand)]
     Zpools(ZpoolCommands),
+
+    /// print information about the local bootstore node
+    #[clap(subcommand)]
+    Bootstore(BootstoreCommands),
 }
 
 #[derive(Debug, Subcommand)]
@@ -45,6 +49,12 @@ enum ZpoolCommands {
     List,
 }
 
+#[derive(Debug, Subcommand)]
+enum BootstoreCommands {
+    /// Show the internal state of the local bootstore node
+    Status,
+}
+
 impl SledAgentArgs {
     /// Run a `omdb sled-agent` subcommand.
     pub(crate) async fn run_cmd(
@@ -70,6 +80,9 @@ impl SledAgentArgs {
             SledAgentCommands::Zpools(ZpoolCommands::List) => {
                 cmd_zpools_list(&client).await
             }
+            SledAgentCommands::Bootstore(BootstoreCommands::Status) => {
+                cmd_bootstore_status(&client).await
+            }
         }
     }
 }
@@ -110,3 +123,46 @@ async fn cmd_zpools_list(
 
     Ok(())
 }
+
+/// Runs `omdb sled-agent bootstore status`
+async fn cmd_bootstore_status(
+    client: &sled_agent_client::Client,
+) -> Result<(), anyhow::Error> {
+    let status = client.bootstore_status().await.context("bootstore status")?;
+    println!("fsm ledger generation: {}", status.fsm_ledger_generation);
+    println!(
+        "network config ledger generation: {:?}",
+        status.network_config_ledger_generation
+    );
+    println!("fsm state: {}", status.fsm_state);
+    println!("peers (found by ddmd):");
+    if status.peers.is_empty() {
+        println!("    <none>");
+    }
+    for peer in status.peers.iter() {
+        println!("    {peer}");
+    }
+    println!("established connections:");
+    if status.established_connections.is_empty() {
+        println!("    <none>");
+    }
+    for c in status.established_connections.iter() {
+        println!("     {:?} : {}", c.baseboard, c.addr);
+    }
+    println!("accepted connections:");
+    if status.accepted_connections.is_empty() {
+        println!("    <none>");
+    }
+    for addr in status.accepted_connections.iter() {
+        println!("    {addr}");
+    }
+    println!("negotiating connections:");
+    if status.negotiating_connections.is_empty() {
+        println!("    <none>");
+    }
+    for addr in status.negotiating_connections.iter() {
+        println!("    {addr}");
+    }
+
+    Ok(())
+}

dev-tools/omdb/tests/env.out

@@ -57,11 +57,11 @@ task: "dns_propagation_internal"
 
 
 task: "dns_servers_external"
-    watches list of external DNS servers stored in CockroachDB
+    watches list of external DNS servers stored in internal DNS
 
 
 task: "dns_servers_internal"
-    watches list of internal DNS servers stored in CockroachDB
+    watches list of internal DNS servers stored in internal DNS
 
 
 task: "external_endpoints"
@@ -147,11 +147,11 @@ task: "dns_propagation_internal"
 
 
 task: "dns_servers_external"
-    watches list of external DNS servers stored in CockroachDB
+    watches list of external DNS servers stored in internal DNS
 
 
 task: "dns_servers_internal"
-    watches list of internal DNS servers stored in CockroachDB
+    watches list of internal DNS servers stored in internal DNS
 
 
 task: "external_endpoints"
@@ -224,11 +224,11 @@ task: "dns_propagation_internal"
 
 
 task: "dns_servers_external"
-    watches list of external DNS servers stored in CockroachDB
+    watches list of external DNS servers stored in internal DNS
 
 
 task: "dns_servers_internal"
-    watches list of internal DNS servers stored in CockroachDB
+    watches list of internal DNS servers stored in internal DNS
 
 
 task: "external_endpoints"

dev-tools/omdb/tests/successes.out

@@ -251,11 +251,11 @@ task: "dns_propagation_internal"
 
 
 task: "dns_servers_external"
-    watches list of external DNS servers stored in CockroachDB
+    watches list of external DNS servers stored in internal DNS
 
 
 task: "dns_servers_internal"
-    watches list of internal DNS servers stored in CockroachDB
+    watches list of internal DNS servers stored in internal DNS
 
 
 task: "external_endpoints"
@@ -313,7 +313,7 @@ task: "dns_servers_internal"
 task: "dns_propagation_internal"
   configured period: every 1m
   currently executing: no
-  last completed activation: iter 5, triggered by a dependent task completing
+  last completed activation: iter 4, triggered by a dependent task completing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     attempt to propagate generation: 1
 
@@ -341,7 +341,7 @@ task: "dns_servers_external"
 task: "dns_propagation_external"
   configured period: every 1m
   currently executing: no
-  last completed activation: iter 5, triggered by a dependent task completing
+  last completed activation: iter 4, triggered by a dependent task completing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     attempt to propagate generation: 2
 

dev-tools/omdb/tests/usage_errors.out

@@ -331,9 +331,10 @@ Debug a specific Sled
 Usage: omdb sled-agent [OPTIONS] <COMMAND>
 
 Commands:
-  zones   print information about zones
-  zpools  print information about zpools
-  help    Print this message or the help of the given subcommand(s)
+  zones      print information about zones
+  zpools     print information about zpools
+  bootstore  print information about the local bootstore node
+  help       Print this message or the help of the given subcommand(s)
 
 Options:
       --sled-agent-url <SLED_AGENT_URL>  URL of the Sled internal API [env: OMDB_SLED_AGENT_URL=]