"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
log: fix race when adding a log output while logging
Nick Craig-Wood4cd6359ae988
diff --git a/fs/log/slog.go b/fs/log/slog.goindex 387500703..31dd4188d 100644--- a/fs/log/slog.go+++ b/fs/log/slog.go@@ -360,17 +360,19 @@ func (h *OutputHandler) Handle(ctx context.Context, r slog.Record) (err error) {buf *bytes.Buffer)- // Read the format under the mutex once so it is consistent- // throughout this call. The mutex is released before calling- // jsonLog/textLog (which may re-acquire it) to avoid deadlock.+ // Read the format and the extra outputs under the mutex once+ // so they are consistent throughout this call. The mutex is+ // released before calling jsonLog/textLog (which may re-acquire+ // it) to avoid deadlock.h.mu.Lock()format := h.format+ outputExtra := h.outputExtrah.mu.Unlock()// Check whether we need to build Text or JSON logs or bothneedJSON := format&logFormatJSON != 0needText := !needJSON- for _, out := range h.outputExtra {+ for _, out := range outputExtra {if out.json {needJSON = true} else {@@ -413,7 +415,7 @@ func (h *OutputHandler) Handle(ctx context.Context, r slog.Record) (err error) {}// Log to any additional destinations required- for _, out := range h.outputExtra {+ for _, out := range outputExtra {if out.json {out.output(r.Level, bufJSON.String())} else {diff --git a/fs/log/slog_test.go b/fs/log/slog_test.goindex 1c61a3868..a4b592329 100644--- a/fs/log/slog_test.go+++ b/fs/log/slog_test.go@@ -346,6 +346,15 @@ func TestOutputHandlerConcurrency(t *testing.T) {}})+ // Goroutine calling AddOutput alternating JSON and text+ wg.Go(func() {+ noop := func(_ slog.Level, _ string) {}+ for j := range 20 {+ h.AddOutput(j%2 == 0, noop)+ time.Sleep(time.Millisecond)+ }+ })+// Use a channel with a timeout to detect deadlocksdone := make(chan struct{})go func() {