do not miss error messages during cancel (#910)

Denchick · web-flow · commit d0b95dd17f70 · 2025-01-07T22:11:30.000+01:00
diff --git a/router/server/multishard.go b/router/server/multishard.go
@@ -461,11 +461,16 @@ func (m *MultiShardServer) Sync() int64 {
 }
 
 func (m *MultiShardServer) Cancel() error {
-	var err error
+	var errs []error
 	for _, sh := range m.activeShards {
-		err = sh.Cancel()
+		if err := sh.Cancel(); err != nil {
+			errs = append(errs, err)
+		}
+	}
+	if len(errs) > 0 {
+		return fmt.Errorf("errors occurred during cancel: %w", fmt.Errorf("%v", errs))
 	}
-	return err
+	return nil
 }
 
 func (m *MultiShardServer) SetTxStatus(tx txstatus.TXStatus) {

Original file line number	Diff line number	Diff line change
`@@ -461,11 +461,16 @@ func (m *MultiShardServer) Sync() int64 {`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`func (m *MultiShardServer) Cancel() error {`
`464`		`- var err error`
	`464`	`+ var errs []error`
`465`	`465`	`for _, sh := range m.activeShards {`
`466`		`- err = sh.Cancel()`
	`466`	`+ if err := sh.Cancel(); err != nil {`
	`467`	`+ errs = append(errs, err)`
	`468`	`+ }`
	`469`	`+ }`
	`470`	`+ if len(errs) > 0 {`
	`471`	`+ return fmt.Errorf("errors occurred during cancel: %w", fmt.Errorf("%v", errs))`
`467`	`472`	`}`
`468`		`- return err`
	`473`	`+ return nil`
`469`	`474`	`}`
`470`	`475`
`471`	`476`	`func (m *MultiShardServer) SetTxStatus(tx txstatus.TXStatus) {`