Merge pull request #1322 from tyler92/fix-data-race-in-layers

Fix data race between ReloadIfChanged and read-only usage of layerStore
containers · Sep 6, 2022 · abfc271 · abfc271
2 parents 8aa3b3a + a360de2
commit abfc271
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/layers.go b/layers.go
@@ -423,6 +423,15 @@ func (r *layerStore) Load() error {
 		}
 	}
 
+	info, statErr := os.Stat(r.layerspath())
+	if statErr != nil && !os.IsNotExist(statErr) {
+		return statErr
+	}
+
+	if info != nil {
+		r.layerspathModified = info.ModTime()
+	}
+
 	return err
 }
 
@@ -1924,7 +1933,6 @@ func (r *layerStore) Modified() (bool, error) {
 	}
 	if info != nil {
 		tmodified = info.ModTime() != r.layerspathModified
-		r.layerspathModified = info.ModTime()
 	}
 
 	return tmodified, nil