be consistent with crdb socket addr vs ip/port pair

oxidecomputer · May 28, 2024 · 7e3ca84 · 7e3ca84
1 parent 312e11d
commit 7e3ca84
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
@@ -1703,37 +1703,29 @@ impl ServiceManager {
                     return Err(Error::SledAgentNotReady);
                 };
 
-                let crdb_listen_addr = *underlay_address;
-                let crdb_listen_port = COCKROACH_ADMIN_PORT;
+                let crdb_listen_ip = *underlay_address;
                 let crdb_address = SocketAddr::new(
-                    IpAddr::V6(crdb_listen_addr),
+                    IpAddr::V6(crdb_listen_ip),
                     COCKROACH_PORT,
-                );
+                )
+                .to_string();
                 let admin_address = SocketAddr::new(
-                    IpAddr::V6(crdb_listen_addr),
+                    IpAddr::V6(crdb_listen_ip),
                     COCKROACH_ADMIN_PORT,
-                );
+                )
+                .to_string();
 
                 let nw_setup_service = Self::zone_network_setup_install(
                     &info.underlay_address,
                     &installed_zone,
-                    &crdb_listen_addr,
+                    &crdb_listen_ip,
                 )?;
 
                 let dns_service = Self::dns_install(info, None, &None).await?;
 
                 // Configure the CockroachDB service.
                 let cockroachdb_config = PropertyGroupBuilder::new("config")
-                    .add_property(
-                        "listen_addr",
-                        "astring",
-                        crdb_listen_addr.to_string(),
-                    )
-                    .add_property(
-                        "listen_port",
-                        "astring",
-                        crdb_listen_port.to_string(),
-                    )
+                    .add_property("listen_addr", "astring", &crdb_address)
                     .add_property("store", "astring", "/data");
                 let cockroachdb_service =
                     ServiceBuilder::new("oxide/cockroachdb").add_instance(
@@ -1747,13 +1739,9 @@ impl ServiceManager {
                         .add_property(
                             "cockroach_address",
                             "astring",
-                            &crdb_address.to_string(),
+                            crdb_address,
                         )
-                        .add_property(
-                            "http_address",
-                            "astring",
-                            &admin_address.to_string(),
-                        );
+                        .add_property("http_address", "astring", admin_address);
                 let cockroach_admin_service =
                     ServiceBuilder::new("oxide/cockroach-admin").add_instance(
                         ServiceInstanceBuilder::new("default")

diff --git a/smf/cockroachdb/manifest.xml b/smf/cockroachdb/manifest.xml
@@ -29,7 +29,6 @@
 
   <property_group name='config' type='application'>
     <propval name='listen_addr' type='astring' value='unknown' />
-    <propval name='listen_port' type='astring' value='unknown' />
     <propval name='store' type='astring' value='unknown' />
   </property_group>
 

diff --git a/smf/cockroachdb/method_script.sh b/smf/cockroachdb/method_script.sh
@@ -7,7 +7,6 @@ set -o pipefail
 . /lib/svc/share/smf_include.sh
 
 LISTEN_ADDR="$(svcprop -c -p config/listen_addr "${SMF_FMRI}")"
-LISTEN_PORT="$(svcprop -c -p config/listen_port "${SMF_FMRI}")"
 DATASTORE="$(svcprop -c -p config/store "${SMF_FMRI}")"
 
 # We need to tell CockroachDB the DNS names or IP addresses of the other nodes
@@ -25,7 +24,7 @@ fi
 
 args=(
   '--insecure'
-  '--listen-addr' "[$LISTEN_ADDR]:$LISTEN_PORT"
+  '--listen-addr' "$LISTEN_ADDR"
   '--http-addr' '127.0.0.1:8080'
   '--store' "$DATASTORE"
   '--join' "$JOIN_ADDRS"