Wait for cache cleanup goroutine to finish

PelicanPlatform · Nov 28, 2023 · d2e419a · d2e419a
1 parent ce4ba29
commit d2e419a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cmd/cache_serve.go b/cmd/cache_serve.go
@@ -149,8 +149,11 @@ func serveCache( /*cmd*/ *cobra.Command /*args*/, []string) error {
 	shutdownCtx, shutdownCancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 
-	defer config.CleanupTempResources()
-	defer shutdownCancel()
+	defer func() {
+		shutdownCancel()
+		wg.Wait()
+		config.CleanupTempResources()
+	}()
 
 	err := config.DiscoverFederation()
 	if err != nil {

diff --git a/cmd/origin_serve.go b/cmd/origin_serve.go
@@ -105,8 +105,11 @@ func serveOrigin( /*cmd*/ *cobra.Command /*args*/, []string) error {
 	shutdownCtx, shutdownCancel := context.WithCancel(context.Background())
 	var wg sync.WaitGroup
 
-	defer config.CleanupTempResources()
-	defer shutdownCancel()
+	defer func() {
+		shutdownCancel()
+		wg.Wait()
+		config.CleanupTempResources()
+	}()
 
 	wg.Add(1)
 	err := xrootd.SetUpMonitoring(shutdownCtx, &wg)