Rework after code review

opencadc · Mar 14, 2024 · 43f98bd · 43f98bd
1 parent 4dde678
commit 43f98bd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/cadc-inventory-db/src/main/java/org/opencadc/inventory/ArtifactSyncWorker.java b/cadc-inventory-db/src/main/java/org/opencadc/inventory/ArtifactSyncWorker.java
@@ -110,14 +110,15 @@ public void run() {
             while (iter.hasNext()) {
                 Artifact artifact = iter.next();
                 DataNode node = nodeDAO.getDataNode(artifact.getURI());
-                if ((node != null) && !artifact.getContentLength().equals(node.bytesUsed)) {
-                    node.bytesUsed = artifact.getContentLength();
+                if (node != null  && !artifact.getContentLength().equals(node.bytesUsed)) {
                     tm.startTransaction();
                     try {
+                        node = (DataNode)nodeDAO.lock(node);
+                        if (node == null) {
+                            continue; // node gone - race condition
+                        }
+                        node.bytesUsed = artifact.getContentLength();
                         nodeDAO.put(node);
-                        harvestState.curLastModified = artifact.getLastModified();
-                        harvestState.curID = node.getID();
-                        harvestStateDAO.put(harvestState, true);
                         tm.commitTransaction();
                         log.debug("Updated size of data node " + node.getName());
                     } catch (Exception ex) {
@@ -133,6 +134,9 @@ public void run() {
                         }
                     }
                 }
+                harvestState.curLastModified = artifact.getLastModified();
+                harvestState.curID = node.getID();
+                harvestStateDAO.put(harvestState);
             }
         } catch (IOException ex) {
             log.error("Error closing iterator", ex);