Support unreadable files

--
MOS_MIGRATED_REVID=112507181

1 files changed, 15 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileStateValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileStateValue.java
index 80b43a7486..459d1caa48 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileStateValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileStateValue.java
@@ -164,11 +164,9 @@ public abstract class FileStateValue implements SkyValue {
                                         @Nullable TimestampGranularityMonitor tsgm)
         throws InconsistentFilesystemException {
       Preconditions.checkState(stat.isFile(), path);
+
       try {
-        byte[] digest = stat.getDigest();
-        if (digest == null) {
-          digest = path.getFastDigest();
-        }
+        byte[] digest = tryGetDigest(path, stat);
         if (digest == null) {
           long mtime = stat.getLastModifiedTime();
           // Note that TimestampGranularityMonitor#notifyDependenceOnFileTime is a thread-safe
@@ -193,6 +191,19 @@ public abstract class FileStateValue implements SkyValue {
       }
     }
 
+    @Nullable
+    private static byte[] tryGetDigest(Path path, FileStatusWithDigest stat) throws IOException {
+      try {
+        byte[] digest = stat.getDigest();
+        return digest != null ? digest : path.getFastDigest();
+      } catch (IOException ioe) {
+        if (!path.isReadable()) {
+          return null;
+        }
+        throw ioe;
+      }
+    }
+
     @Override
     public Type getType() {
       return Type.REGULAR_FILE;