diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d15addee21fff20d1078b819779ad608b684d12..41179db60265429b7d7162511040b8e8324e53e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] -Nothing yet. +### Fixed + +* Fixed exports not starting in 1.0.0-rc.1. ## [1.0.0-rc.1] - December 29, 2019 diff --git a/controllers/data_controller/export_controller.go b/controllers/data_controller/export_controller.go index 15a44e3b137fb1e8c1ef0f9249490671ed3816f5..bf656ebe50134e9b694b67f090d2c75e78bc732f 100644 --- a/controllers/data_controller/export_controller.go +++ b/controllers/data_controller/export_controller.go @@ -4,6 +4,7 @@ import ( "archive/tar" "bytes" "compress/gzip" + "context" "encoding/json" "fmt" "io" @@ -62,6 +63,10 @@ func StartServerExport(serverName string, s3urls bool, includeData bool, ctx rco } go func() { + // Use a new context in the goroutine + ctx.Context = context.Background() + db := storage.GetDatabase().GetMetadataStore(ctx) + ds, err := datastore.PickDatastore(common.KindArchives, ctx) if err != nil { ctx.Log.Error(err) @@ -108,6 +113,10 @@ func StartUserExport(userId string, s3urls bool, includeData bool, ctx rcontext. } go func() { + // Use a new context in the goroutine + ctx.Context = context.Background() + db := storage.GetDatabase().GetMetadataStore(ctx) + ds, err := datastore.PickDatastore(common.KindArchives, ctx, ) if err != nil { ctx.Log.Error(err)