Check that delete does not have children

2 files changed, 13 insertions, 2 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
index 21ce9917715..74f62e12b00 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
@@ -19,9 +19,10 @@ class CuratorDeleteOperation implements CuratorOperation {
 
     @Override
     public void check(Curator curator, TransactionChanges changes) {
-        // TODO: Check children
         if (  ! curator.exists(Path.fromString(path)) && ! changes.creates(path))
             throw new IllegalStateException("Cannot perform " + this + ": Path does not exist");
+        if (curator.getChildren(Path.fromString(path)).size() > 0 || changes.createsChildrenOf(path))
+            throw new IllegalStateException("Cannot perform " + this + ": Path is not empty");
         changes.addDeletes(path);
     }
 
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
index 4a370ce464b..f65e0de4733 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
@@ -20,7 +20,17 @@ public class TransactionChanges {
     public boolean creates(String path) {
         return createdPaths.contains(path);
     }
-    
+
+    /** Returns whether the changes include creating any (proper) children of the given path */
+    public boolean createsChildrenOf(String parentPath) {
+        if ( ! parentPath.endsWith("/")) 
+            parentPath = parentPath + "/";
+        for (String createdPath : createdPaths)
+            if (createdPath.startsWith(parentPath))
+                return true;
+        return false;
+    }
+
     /** Adds creation of an absolute path to the set of changes made by this */
     public void addCreates(String path) {
         deletedPaths.remove(path);