From 31d9bb01f54e5a172ae45789413535c36a7ef6da Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Wed, 3 Oct 2012 18:18:48 +0000
Subject: [PATCH] Reinstate behaviour that we cycle a backend if it throws an
 AhuException. Temporary errors whould throw DBExceptions. We do keep the
 logging of such an error. Closes ticket 386, reverts commit 2100.

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2734 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/packethandler.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index ce6f934b68..1986dbf15a 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1331,10 +1331,8 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     S.ringAccount("servfail-queries",p->qdomain);
   }
   catch(AhuException &e) {
-    L<<Logger::Error<<"Database module reported condition which prevented lookup ("+e.reason+") sending out servfail"<<endl;
-    r->setRcode(RCode::ServFail);
-    S.inc("servfail-packets");
-    S.ringAccount("servfail-queries",p->qdomain);
+    L<<Logger::Error<<"Database module reported permanent error which prevented lookup ("+e.reason+") sending out servfail"<<endl;
+    throw; // we WANT to die at this point
   }
   catch(std::exception &e) {
     L<<Logger::Error<<"Exception building answer packet ("<<e.what()<<") sending out servfail"<<endl;
-- 
2.47.3