Merge pull request #390 from flyingcircusio/fix-dns-lookup-on-provisi…

…oning provisioning: properly catch documented errors for `getaddrinfo`
flyingcircusio · Sep 19, 2023 · 1f28f0c · 1f28f0c
2 parents c6a5669 + ce139ea
commit 1f28f0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,7 +4,8 @@
 ## 2.4rc2 (unreleased)
 ----------------------
 
-- Nothing changed yet.
+- Fix bug where some rare exceptions (caused by DNS resolvers during provisioning)
+  bubbled incorrectly and caused spurious deployment errors.
 
 
 ## 2.4rc1 (2023-09-12)

diff --git a/src/batou/provision.py b/src/batou/provision.py
@@ -118,7 +118,10 @@ def configure_host(self, host, config):
                     f" alias override v4 {alias_fqdn} -> {addr}", debug=True
                 )
                 batou.utils.resolve_override[alias_fqdn] = addr
-        except (socket.gaierror, ValueError):
+        except (OSError, ValueError):
+            # We used to catch socket.gaierror here, but reading the
+            # docs correctly it can raise any OSError (and socket and gaierror
+            # are subclasses)
             pass
 
         try:
@@ -128,7 +131,10 @@ def configure_host(self, host, config):
                     f" alias override v6 {alias_fqdn} -> {addr}", debug=True
                 )
                 batou.utils.resolve_v6_override[alias_fqdn] = addr
-        except (socket.gaierror, ValueError):
+        except (OSError, ValueError):
+            # We used to catch socket.gaierror here, but reading the
+            # docs correctly it can raise any OSError (and socket and gaierror
+            # are subclasses)
             pass
 
     def summarize(self, host):