From d3b5b5236aeb942899d72ed1f583a1a557776866 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 31 May 2021 19:22:01 -0400
Subject: [PATCH] Remove transactional delete

This just doesn't work due to the darn limit on recursive deletes in
transactions.
---
 daemon-common/zkhandler.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/daemon-common/zkhandler.py b/daemon-common/zkhandler.py
index 6a557c98..3843d574 100644
--- a/daemon-common/zkhandler.py
+++ b/daemon-common/zkhandler.py
@@ -218,17 +218,15 @@ class ZKHandler(object):
         if type(keys) is not list:
             keys = [keys]
 
-        transaction = self.zk_conn.transaction()
-
         for key in keys:
-            transaction.delete(key, recursive=recursive)
+            if self.exists(key):
+                try:
+                    self.zk_conn.delete(key, recursive=recursive)
+                except Exception as e:
+                    self.log("ZKHandler error: Failed to delete key {}: {}".format(key, e), state='e')
+                    return False
 
-        try:
-            transaction.commit()
-            return True
-        except Exception as e:
-            self.log("ZKHandler error: Failed to commit transaction: {}".format(e), state='e')
-            return False
+        return True
 
     def children(self, key):
         """