From 4d8d1e287ba394d486bd1f7616ddb26fa4b79c89 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Tue, 25 Feb 2020 17:36:38 +0000 Subject: [PATCH] googlephotos: fix "concurrent map write" error - fixes #4003 This adds a bit of missed locking around the uploaded info to fix the concurrent map write. All the other accesses have locking - this one must have got missed. --- backend/googlephotos/googlephotos.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/googlephotos/googlephotos.go b/backend/googlephotos/googlephotos.go index 3a8775222..4fa4b327d 100644 --- a/backend/googlephotos/googlephotos.go +++ b/backend/googlephotos/googlephotos.go @@ -1003,7 +1003,9 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op // Add upload to internal storage if pattern.isUpload { + o.fs.uploadedMu.Lock() o.fs.uploaded.AddEntry(o) + o.fs.uploadedMu.Unlock() } return nil }