Fix error caused by incorrect select case statement

Longhorn 8548 Signed-off-by: Derek Su <derek.su@suse.com>
longhorn · May 13, 2024 · ed49dd3 · ed49dd3
1 parent b5a2774
commit ed49dd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/sparse/client.go b/sparse/client.go
@@ -195,11 +195,8 @@ func (client *syncClient) syncContent() error {
 	// the below select will exit once all error channels are closed, or a single
 	// channel has run into an error, which will lead to the ctx being cancelled
 	mergedErrc := mergeErrorChannels(ctx, errorChannels...)
-	select {
-	case err = <-mergedErrc:
-		break
-	default:
-	}
+	err = <-mergedErrc
+
 	return err
 }
 

diff --git a/sparse/sfold.go b/sparse/sfold.go
@@ -127,11 +127,7 @@ func coalesce(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops Fil
 	// the below select will exit once all error channels are closed, or a single
 	// channel has run into an error, which will lead to the ctx being cancelled
 	mergedErrc := mergeErrorChannels(ctx, errorChannels...)
-	select {
-	case err = <-mergedErrc:
-		break
-	default:
-	}
+	err = <-mergedErrc
 
 	log.Debugf("Finished fold for parent %v, child %v, size %v, elapsed %.2fs",
 		parentFileIo.Name(), childFileIo.Name(), fileSize,

diff --git a/sparse/sprune.go b/sparse/sprune.go
@@ -101,11 +101,7 @@ func prune(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops FileHa
 	// the below select will exit once all error channels are closed, or a single
 	// channel has run into an error, which will lead to the ctx being cancelled
 	mergedErrc := mergeErrorChannels(ctx, errorChannels...)
-	select {
-	case err = <-mergedErrc:
-		break
-	default:
-	}
+	err = <-mergedErrc
 
 	log.Debugf("Finished pruning for parent %v, child %v, size %v, elapsed %.2fs",
 		parentFileIo.Name(), childFileIo.Name(), fileSize,