commit 2c042f924ce8fff91d245664a1c33e88c21b94e2
author Nasser Grainawi <nasser@codeaurora.org> Wed Mar 11 11:09:50 2020 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Mon May 11 19:07:14 2020 +0000
tree 15f998619dc4a519638d8d3698a64c84bfcb7643
parent f8319d6c6c274165d894a5ce3e01dd4f301698ed

ReplicationTasksStorage: Handle DirectoryIteratorExceptions (part 2)

These exceptions wrap IOExceptions for methods whose contract doesn't
allow them to throw an IOException. In situations where storage is NFS
based, it's common to have Stale NFS File Handle errors when iterating a
directory that can be moved and undesirable to log each time that
occurs.

Change-Id: I1f3757ad5d2ff55220475b6a81b6f8446d05f7aa

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();