improve message

CDLUC3 · Aug 16, 2024 · 6dd0f6b · 6dd0f6b
1 parent 0a3c95e
commit 6dd0f6b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/cdlib/mrt/zk/Access.java b/src/main/java/org/cdlib/mrt/zk/Access.java
@@ -98,7 +98,7 @@ public static Access createAssembly(ZooKeeper client, Queues queueName, JSONObje
 
   public void delete(ZooKeeper client) throws MerrittStateError, MerrittZKNodeInvalid, KeeperException, InterruptedException {
     if (!this.status().isDeletable()) {
-      throw new MerrittStateError(String.format("Delete invalid for %s", path()));
+      throw new MerrittStateError(String.format("Delete invalid for %s (%s)", path(), this.status().name()));
     }
     QueueItemHelper.deleteAll(client, path());
   }

diff --git a/src/main/java/org/cdlib/mrt/zk/Batch.java b/src/main/java/org/cdlib/mrt/zk/Batch.java
@@ -97,7 +97,7 @@ public static Batch createBatch(ZooKeeper client, JSONObject submission) throws
   public void delete(ZooKeeper client) throws MerrittStateError, MerrittZKNodeInvalid, KeeperException, InterruptedException {
     String[] dirs = {BatchJobStates.Processing.path, BatchJobStates.Failed.path, BatchJobStates.Completed.path};
     if (!this.status().isDeletable()) {
-      throw new MerrittStateError(String.format("Delete invalid for %s", path()));
+      throw new MerrittStateError(String.format("Delete invalid for %s (%s)", path(), this.status().name()));
     }
     for(String state: dirs) {
       String p = String.format("%s/states/%s", path(), state);

diff --git a/src/main/java/org/cdlib/mrt/zk/Job.java b/src/main/java/org/cdlib/mrt/zk/Job.java
@@ -359,7 +359,7 @@ public void setJobStatePath(ZooKeeper client) throws MerrittZKNodeInvalid, Inter
 
   public void delete(ZooKeeper client) throws MerrittStateError, MerrittZKNodeInvalid, InterruptedException, KeeperException {
     if (!this.status().isDeletable()) {
-      throw new MerrittStateError(String.format("Delete invalid for %s", path()));
+      throw new MerrittStateError(String.format("Delete invalid for %s (%s)", path(), this.status().name()));
     }
     QueueItemHelper.delete(client, jobStatePath());
     QueueItemHelper.delete(client, batchStatePath());