ADBDEV-6641-ws

backup/data.go

@@ -173,7 +173,6 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 	 */
 	tasks := make(chan Table, len(tables))
 	var oidMap sync.Map
-	var isErroredBackup atomic.Bool
 	var workerPool sync.WaitGroup
 	// Record and track tables in a hashmap of oids and table states (preloaded with value Unknown).
 	// The tables are loaded into the tasks channel for the subsequent goroutines to work on.
@@ -223,7 +222,7 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 					return // Error somewhere, terminate
 				default: // Default is must to avoid blocking
 				}
-				if wasTerminated.Load() || isErroredBackup.Load() {
+				if wasTerminated.Load() {
 					counters.ProgressBar.(*pb.ProgressBar).NotPrint = true
 					cancel()
 					return
@@ -245,7 +244,6 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 				err := LockTableNoWait(table, whichConn)
 				if err != nil {
 					if pgErr, ok := err.(*pgconn.PgError); ok && pgErr.Code != PG_LOCK_NOT_AVAILABLE {
-						isErroredBackup.Store(true)
 						err = connectionPool.Rollback(whichConn)
 						if err != nil {
 							gplog.Warn("Worker %d: %s", whichConn, err)
@@ -278,7 +276,6 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 					// if copy isn't working, skip remaining backups, and let downstream panic
 					// handling deal with it
 					counters.ProgressBar.(*pb.ProgressBar).NotPrint = true
-					isErroredBackup.Store(true)
 					gplog.Fatal(err, "")
 				} else {
 					oidMap.Store(table.Oid, Complete)
@@ -313,7 +310,7 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 					return // Error somewhere, terminate
 				default: // Default is must to avoid blocking
 				}
-				if wasTerminated.Load() || isErroredBackup.Load() {
+				if wasTerminated.Load() {
 					cancel()
 					return
 				}
@@ -323,7 +320,6 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 				} else if state.(int) == Deferred {
 					err := BackupSingleTableData(ctx, table, rowsCopiedMaps[0], &counters, 0)
 					if err != nil {
-						isErroredBackup.Store(true)
 						gplog.Fatal(err, "")
 					}
 					oidMap.Store(table.Oid, Complete)
@@ -354,7 +350,7 @@ func BackupDataForAllTables(tables []Table) []map[uint32]int64 {
 	if backupSnapshot == "" {
 		allWorkersTerminatedLogged := false
 		for _, table := range tables {
-			if wasTerminated.Load() || isErroredBackup.Load() {
+			if wasTerminated.Load() {
 				counters.ProgressBar.(*pb.ProgressBar).NotPrint = true
 				break
 			}