Merge pull request #14058 from mind04/auth-4.9.x-bp-14057

Auth-4.9.x: Partial backport of #14057
PowerDNS · May 14, 2024 · 44005ac · 44005ac
2 parents 9e10922 + c90a4fb
commit 44005ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/pdns/auth-primarycommunicator.cc b/pdns/auth-primarycommunicator.cc
@@ -157,16 +157,21 @@ void CommunicatorClass::getUpdatedProducers(UeberBackend* B, vector<DomainInfo>&
           continue;
         }
 
-        B->setDomainMetadata(di.zone, "CATALOG-HASH", mapHash);
-
-        g_log << Logger::Warning << "new CATALOG-HASH '" << mapHash << "' for zone '" << di.zone << "'" << endl;
-
         SOAData sd;
-        if (!B->getSOAUncached(di.zone, sd)) {
-          g_log << Logger::Warning << "SOA lookup failed for producer zone '" << di.zone << "'" << endl;
+        try {
+          if (!B->getSOAUncached(di.zone, sd)) {
+            g_log << Logger::Warning << "SOA lookup failed for producer zone '" << di.zone << "'" << endl;
+            continue;
+          }
+        }
+        catch (...) {
           continue;
         }
 
+        g_log << Logger::Warning << "new CATALOG-HASH '" << mapHash << "' for zone '" << di.zone << "'" << endl;
+
+        B->setDomainMetadata(di.zone, "CATALOG-HASH", mapHash);
+
         DNSResourceRecord rr;
         makeIncreasedSOARecord(sd, "EPOCH", "", rr);
         di.backend->startTransaction(sd.qname, -1);

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
@@ -463,7 +463,7 @@ void GSQLBackend::getUnfreshSecondaryInfos(vector<DomainInfo>* unfreshDomains)
         continue;
       }
       catch (...) {
-        g_log << Logger::Warning << __PRETTY_FUNCTION__ << " error while parsing SOA data for zone '" << di.zone << endl;
+        g_log << Logger::Warning << __PRETTY_FUNCTION__ << " error while parsing SOA data for zone '" << di.zone << "'" << endl;
         continue;
       }