br: backup command with parameter s3 endpoint has suffix '/'

br/pkg/backup/client.go

@@ -452,7 +452,13 @@ func (bc *Client) BackupRanges(
 			elctx := logutil.ContextWithField(ectx, logutil.RedactAny("range-sn", id))
 			err := bc.BackupRange(elctx, sk, ek, req, metaWriter, progressCallBack)
 			if err != nil {
-				return errors.Trace(err)
+				// The error due to context cancel, stack trace is meaningless, the stack shall be suspended (also clear)
+				if errors.Cause(err) == context.Canceled {
+					return errors.SuspendStack(err)
+				} else {
+					return errors.Trace(err)
+				}
+
 			}
 			return nil
 		})

br/pkg/storage/s3.go

@@ -245,6 +245,11 @@ func newS3Storage(backend *backuppb.S3, opts *ExternalStorageOptions) (*S3Storag
 		WithS3ForcePathStyle(qs.ForcePathStyle).
 		WithRegion(qs.Region)
 	request.WithRetryer(awsConfig, defaultS3Retryer())
+
+	if len(qs.Endpoint) > 0) {
+		strings.TrimSuffix(qs.Endpoint, "/")
+	}
+
 	if qs.Endpoint != "" {
 		awsConfig.WithEndpoint(qs.Endpoint)
 	}

br/pkg/summary/collector.go

@@ -3,12 +3,14 @@
 package summary
 
 import (
+	"context"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/docker/go-units"
 	"github.com/pingcap/log"
+	"github.com/pkg/errors"
 	"go.uber.org/zap"
 )
 
@@ -188,9 +190,16 @@ func (tc *logCollector) Summary(name string) {
 	}
 
 	if len(tc.failureReasons) != 0 || !tc.successStatus {
+		canceledUnits := make([]string, 0)
 		for unitName, reason := range tc.failureReasons {
-			logFields = append(logFields, zap.String("unit-name", unitName), zap.Error(reason))
+			if errors.Cause(reason) != context.Canceled {
+				logFields = append(logFields, zap.String("unit-name", unitName), zap.Error(reason))
+			} else {
+				canceledUnits = append(canceledUnits, unitName)
+			}
 		}
+		// only print total number of cancel unit
+		log.Info("units canceled", zap.Int("cancel-unit", len(canceledUnits)))
 		tc.log(name+" failed summary", logFields...)
 		return
 	}