fix: err data race

rudderlabs · Sep 19, 2023 · 9a422d3 · 9a422d3
1 parent 2f828cd
commit 9a422d3
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/warehouse/upload.go b/warehouse/upload.go
@@ -597,57 +597,58 @@ func (job *UploadJob) run() (err error) {
 			wg.Add(3)
 
 			rruntime.GoForWarehouse(func() {
+				defer wg.Done()
+
 				var succeededUserTableCount int
 				for _, userTable := range userTables {
 					if _, ok := currentJobSucceededTables[userTable]; ok {
 						succeededUserTableCount++
 					}
 				}
 				if succeededUserTableCount >= len(userTables) {
-					wg.Done()
 					return
 				}
-				err = job.exportUserTables(loadFilesTableMap)
+				err := job.exportUserTables(loadFilesTableMap)
 				if err != nil {
 					loadErrorLock.Lock()
 					loadErrors = append(loadErrors, err)
 					loadErrorLock.Unlock()
 				}
-				wg.Done()
 			})
 
 			rruntime.GoForWarehouse(func() {
+				defer wg.Done()
+
 				var succeededIdentityTableCount int
 				for _, identityTable := range identityTables {
 					if _, ok := currentJobSucceededTables[identityTable]; ok {
 						succeededIdentityTableCount++
 					}
 				}
 				if succeededIdentityTableCount >= len(identityTables) {
-					wg.Done()
 					return
 				}
-				err = job.exportIdentities()
+				err := job.exportIdentities()
 				if err != nil {
 					loadErrorLock.Lock()
 					loadErrors = append(loadErrors, err)
 					loadErrorLock.Unlock()
 				}
-				wg.Done()
 			})
 
 			rruntime.GoForWarehouse(func() {
+				defer wg.Done()
+
 				specialTables := make([]string, 0, len(userTables)+len(identityTables))
 				specialTables = append(specialTables, userTables...)
 				specialTables = append(specialTables, identityTables...)
 
-				err = job.exportRegularTables(specialTables, loadFilesTableMap)
+				err := job.exportRegularTables(specialTables, loadFilesTableMap)
 				if err != nil {
 					loadErrorLock.Lock()
 					loadErrors = append(loadErrors, err)
 					loadErrorLock.Unlock()
 				}
-				wg.Done()
 			})
 
 			wg.Wait()