cleanup

.github/buildomat/jobs/deploy.sh

@@ -13,8 +13,7 @@
 #:  "%/pool/ext/*/crypt/debug/global/oxide-sled-agent:default.log.*",
 #:  "%/pool/ext/*/crypt/debug/oxz_*/oxide-*.log.*",
 #:  "%/pool/ext/*/crypt/debug/oxz_*/system-illumos-*.log.*",
-#:  "!/pool/ext/*/crypt/debug/oxz_propolis-server_*/*.log.*",
-#:  "%/pool/ext/*/crypt/zone/oxz_internal_dns_*/root/var/tmp/trace"
+#:  "!/pool/ext/*/crypt/debug/oxz_propolis-server_*/*.log.*"
 #: ]
 #: skip_clone = true
 #:

Cargo.toml

@@ -566,7 +566,6 @@ tokio-util = { version = "0.7.11", features = ["io", "io-util"] }
 toml = "0.8.19"
 toml_edit = "0.22.20"
 tough = { version = "0.17.1", features = [ "http" ] }
-tracing-subscriber = "0.3.18"
 trybuild = "1.0.99"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }

clients/oxide-client/src/lib.rs

@@ -50,6 +50,7 @@ impl CustomDnsResolver {
             bind_addr: None,
         });
         let mut resolver_opts = ResolverOpts::default();
+        // Enable edns for potentially larger records
         resolver_opts.edns0 = true;
 
         let resolver =

dns-server/Cargo.toml

@@ -33,7 +33,6 @@ tempfile.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = [ "full" ] }
 toml.workspace = true
-tracing-subscriber.workspace = true
 uuid.workspace = true
 omicron-workspace-hack.workspace = true
 

dns-server/src/bin/dns-server.rs

@@ -35,15 +35,6 @@ pub struct Config {
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
-    std::fs::write("/var/tmp/trace", "xxx\n").unwrap();
-    use tracing_subscriber::fmt::format::FmtSpan;
-    tracing_subscriber::fmt()
-        .with_thread_names(true)
-        .with_span_events(FmtSpan::ENTER)
-        .with_max_level(tracing_subscriber::filter::LevelFilter::TRACE)
-        .with_writer(std::fs::File::create("/var/tmp/trace").unwrap())
-        .init();
-
     let args = Args::parse();
     let config_file = &args.config_file;
     let config_file_contents = std::fs::read_to_string(config_file)

dns-server/src/lib.rs

@@ -171,6 +171,7 @@ impl TransientServer {
             bind_addr: None,
         });
         let mut resolver_opts = ResolverOpts::default();
+        // Enable edns for potentially larger records
         resolver_opts.edns0 = true;
         let resolver =
             TokioAsyncResolver::tokio(resolver_config, resolver_opts);

dns-server/tests/basic_test.rs

@@ -383,6 +383,7 @@ async fn init_client_server(
         bind_addr: None,
     });
     let mut resolver_opts = ResolverOpts::default();
+    // Enable edns for potentially larger records
     resolver_opts.edns0 = true;
 
     let resolver = TokioAsyncResolver::tokio(resolver_config, resolver_opts);

internal-dns/src/resolver.rs

@@ -57,6 +57,7 @@ impl Resolver {
         log: slog::Logger,
     ) -> Result<Self, ResolveError> {
         let (rc, mut opts) = hickory_resolver::system_conf::read_system_conf()?;
+        // Enable edns for potentially larger records
         opts.edns0 = true;
 
         let resolver = TokioAsyncResolver::tokio(rc, opts);
@@ -83,6 +84,7 @@ impl Resolver {
             });
         }
         let mut opts = ResolverOpts::default();
+        // Enable edns for potentially larger records
         opts.edns0 = true;
         opts.use_hosts_file = false;
         opts.num_concurrent_reqs = dns_server_count;
@@ -326,7 +328,7 @@ impl Resolver {
     //   (1) it returns `IpAddr`'s rather than `SocketAddr`'s
     //   (2) it doesn't actually return all the addresses from the Additional
     //       section of the DNS server's response.
-    //       See bluejekyll/hickory-dns#1980
+    //       See hickory-dns/hickory-dns#1980
     //
     // (1) is not a huge deal as we can try to match up the targets ourselves
     // to grab the port for creating a `SocketAddr` but (2) means we need to do

nexus/src/app/external_dns.rs

@@ -31,6 +31,7 @@ impl Resolver {
             });
         }
         let mut opts = ResolverOpts::default();
+        // Enable edns for potentially larger records
         opts.edns0 = true;
         opts.use_hosts_file = false;
         // Do as many requests in parallel as we have configured servers

smf/internal-dns/config.toml

@@ -5,7 +5,7 @@ request_body_max_bytes = 104857600
 
 [log]
 # Show log messages of this level and more severe
-level = "debug"
+level = "info"
 mode = "file"
 path = "/dev/stdout"
 if_exists = "append"