Do not perform network namespace detection on AV update

src/dns/aardvark.rs

@@ -146,23 +146,27 @@ impl Aardvark {
         Ok(())
     }
 
-    pub fn notify(&self, start: bool) -> NetavarkResult<()> {
+    pub fn notify(&self, start: bool, is_update: bool) -> NetavarkResult<()> {
         match self.get_aardvark_pid() {
             Ok(pid) => {
                 match signal::kill(Pid::from_raw(pid), Signal::SIGHUP) {
-                    Ok(_) => match self.check_netns(pid) {
-                        Ok(_) => return Ok(()),
-                        Err(e) => {
-                            // If the error is ENOENT it means the process must have died in
-                            // the meantime so drop down below to start a new server process.
-                            if e.kind() != std::io::ErrorKind::NotFound {
-                                return Err(NetavarkError::wrap(
-                                    "check aardvark-dns netns",
-                                    e.into(),
-                                ));
+                    Ok(_) => {
+                        if !is_update {
+                            match self.check_netns(pid) {
+                                Ok(_) => return Ok(()),
+                                Err(e) => {
+                                    // If the error is ENOENT it means the process must have died in
+                                    // the meantime so drop down below to start a new server process.
+                                    if e.kind() != std::io::ErrorKind::NotFound {
+                                        return Err(NetavarkError::wrap(
+                                            "check aardvark-dns netns",
+                                            e.into(),
+                                        ));
+                                    }
+                                }
                             }
                         }
-                    },
+                    }
                     Err(err) => {
                         // ESRCH == process does not exists
                         // start new sever below in that case and not error
@@ -312,7 +316,7 @@ impl Aardvark {
     pub fn commit_netavark_entries(&self, entries: Vec<AardvarkEntry>) -> NetavarkResult<()> {
         if !entries.is_empty() {
             self.commit_entries(entries)?;
-            self.notify(true)?;
+            self.notify(true, false)?;
         }
         Ok(())
     }
@@ -407,7 +411,7 @@ impl Aardvark {
         // If dns servers were updated notify the aardvark-dns server
         // if refresh is needed.
         if dns_servers_modified {
-            self.notify(false)?;
+            self.notify(false, true)?;
         }
 
         Ok(())
@@ -417,6 +421,6 @@ impl Aardvark {
         for entry in &entries {
             self.delete_entry(entry.container_id, entry.network_name)?;
         }
-        self.notify(false)
+        self.notify(false, false)
     }
 }

test/100-bridge-iptables.bats

@@ -150,8 +150,11 @@ fw_driver=iptables
     run_helper ps "$aardvark_pid"
     assert "${lines[1]}" =~ ".*aardvark-dns --config $NETAVARK_TMPDIR/config/aardvark-dns -p $dns_port run" "aardvark not running or bad options"
 
-    NETAVARK_DNS_PORT="$dns_port" run_netavark --file ${TESTSDIR}/testfiles/dualstack-bridge-network-container-dns-server.json \
+    # Use run_helper instead of run_netavark here to check network namespace detection logic.
+    # See https://github.com/containers/netavark/issues/911 for details.
+    NETAVARK_DNS_PORT="$dns_port" run_helper $NETAVARK --config "$NETAVARK_TMPDIR/config" --rootless "$rootless" --file ${TESTSDIR}/testfiles/dualstack-bridge-network-container-dns-server.json \
         update podman1 --network-dns-servers 8.8.8.8
+    assert "$output" = ""
 
     # check aardvark config and running
     run_helper cat "$NETAVARK_TMPDIR/config/aardvark-dns/podman1"