From: Ruben d'Arco <cyclops@prof-x.net>
Date: Mon, 22 Jul 2013 16:17:03 +0000 (+0200)
Subject: Only commit & purge cache when we have changed
X-Git-Tag: rec-3.6.0-rc1~545^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dce6b818859337b9e5066bb06f1e2b87d9c13d1a;p=thirdparty%2Fpdns.git

Only commit & purge cache when we have changed
---

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index fb843782be..0cd4979aae 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -862,19 +862,25 @@ int PacketHandler::processUpdate(DNSPacket *p) {
       changedRecords++;
     }
 
-    if (!di.backend->commitTransaction()) {
-      L<<Logger::Error<<msgPrefix<<"Failed to commit updates!"<<endl;
-      return RCode::ServFail;
-    }
+    if (changedRecords) {
+      if (!di.backend->commitTransaction()) {
+       L<<Logger::Error<<msgPrefix<<"Failed to commit updates!"<<endl;
+        return RCode::ServFail;
+      }
 
-    S.deposit("rfc2136-changes", changedRecords);
+      S.deposit("rfc2136-changes", changedRecords);
 
-    // Purge the records!
-    string zone(di.zone);
-    zone.append("$");
-    PC.purge(zone);
+      // Purge the records!
+      string zone(di.zone);
+      zone.append("$");
+      PC.purge(zone);
 
-    L<<Logger::Info<<msgPrefix<<"Update completed, "<<changedRecords<<" changed records commited."<<endl;
+      L<<Logger::Info<<msgPrefix<<"Update completed, "<<changedRecords<<" changed records commited."<<endl;
+    } else {
+      //No change, no commit, we perform abort() because some backends might like this more.
+      L<<Logger::Info<<msgPrefix<<"Update completed, 0 changes, rolling back."<<endl;
+      di.backend->abortTransaction();
+    }
     return RCode::NoError; //rfc 2136 3.4.2.5
   }
   catch (SSqlException &e) {