commit b5a1ba99b0efea4e995683f0a1ab768e427c0e23
author Martin Fick <mfick@codeaurora.org> Mon May 11 21:27:24 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 11 21:27:24 2020 +0000
tree ec9d786acc5b79f507d9eb49019fdd83bff45b21
parent e4c6fcc344d94a45c8f3e7d229de9a01f5430564
parent 2c042f924ce8fff91d245664a1c33e88c21b94e2

Merge "ReplicationTasksStorage: Handle DirectoryIteratorExceptions (part 2)"

src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
index c764161..b805c72 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
@@ -168,11 +168,16 @@
     try (DirectoryStream<Path> dirs = Files.newDirectoryStream(createDir(runningUpdates))) {
       for (Path dir : dirs) {
         UriLock lock = null;
-        for (ReplicateRefUpdate u : list(dir)) {
-          if (lock == null) {
-            lock = new UriLock(u);
+        try {
+          for (ReplicateRefUpdate u : list(dir)) {
+            if (lock == null) {
+              lock = new UriLock(u);
+            }
+            new Task(u).reset();
           }
-          new Task(u).reset();
+        } catch (DirectoryIteratorException d) {
+          // iterating over the sub-directories is expected to have dirs disappear
+          Nfs.throwIfNotStaleFileHandle(d.getCause());
         }
         if (lock != null) {
           lock.release();