Null check for ids and retry logic for queue deletion

CDLUC3 · Aug 23, 2024 · 9cbb09d · 9cbb09d
1 parent 62150cb
commit 9cbb09d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/org/cdlib/mrt/zk/Job.java b/src/main/java/org/cdlib/mrt/zk/Job.java
@@ -128,8 +128,10 @@ public String ercWhere() {
 
   public static JSONObject createJobIdentifiers(String primary, String local) {
     JSONObject json = new JSONObject();
+    if (primary == null ) primary = "";
     json.put(MerrittJsonKey.PrimaryId.key(), primary);
     JSONArray arr = new JSONArray();
+    if (local == null ) local = "";
     for(String s: local.split(";")) {
       if (!s.isEmpty()) {
         arr.put(s);

diff --git a/src/main/java/org/cdlib/mrt/zk/QueueItemHelper.java b/src/main/java/org/cdlib/mrt/zk/QueueItemHelper.java
@@ -105,7 +105,17 @@ public static void deleteAll(ZooKeeper client, String p) throws InterruptedExcep
       for(String cp: client.getChildren(p, false)) {
         deleteAll(client, String.format("%s/%s", p, cp));
       }
-      client.delete(p, -1);
+
+      // retry delete, if necessary
+      for (int i=0; i<3; i++) {
+        try {
+           client.delete(p, -1);
+          break;
+       } catch (Exception e) {
+          System.err.println("Error cleaning ZK node: " + p);
+          Thread.sleep(2000);
+       }
+      }
     }
   }