address comments

br/pkg/lightning/backend/local/local.go

@@ -78,6 +78,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/grpc/encoding/gzip"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/status"
 )
@@ -165,6 +166,7 @@ func (f *importClientFactoryImpl) makeConn(ctx context.Context, storeID uint64)
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 	ctx, cancel := context.WithTimeout(ctx, dialTimeout)
+	defer cancel()
 
 	bfConf := backoff.DefaultConfig
 	bfConf.MaxDelay = gRPCBackOffMaxDelay
@@ -181,8 +183,13 @@ func (f *importClientFactoryImpl) makeConn(ctx context.Context, storeID uint64)
 			PermitWithoutStream: true,
 		}),
 	)
-	if f.compressionType != config.CompressionTypeNone {
-		opts = append(opts, grpc.WithDefaultCallOptions(grpc.UseCompressor(f.compressionType.String())))
+	switch f.compressionType {
+	case config.CompressionNone:
+	// do nothing
+	case config.CompressionGzip:
+		opts = append(opts, grpc.WithDefaultCallOptions(grpc.UseCompressor(gzip.Name)))
+	default:
+		return nil, common.ErrInvalidConfig.GenWithStack("unsupported compression type %s", f.compressionType)
 	}
 
 	failpoint.Inject("LoggingImportBytes", func() {
@@ -196,7 +203,6 @@ func (f *importClientFactoryImpl) makeConn(ctx context.Context, storeID uint64)
 	})
 
 	conn, err := grpc.DialContext(ctx, addr, opts...)
-	cancel()
 	if err != nil {
 		return nil, errors.Trace(err)
 	}

br/pkg/lightning/config/config.go

@@ -472,10 +472,10 @@ func (dra DuplicateResolutionAlgorithm) String() string {
 type CompressionType int
 
 const (
-	// CompressionTypeNone means no compression.
-	CompressionTypeNone CompressionType = iota
-	// CompressionTypeGzip means gzip compression.
-	CompressionTypeGzip
+	// CompressionNone means no compression.
+	CompressionNone CompressionType = iota
+	// CompressionGzip means gzip compression.
+	CompressionGzip
 )
 
 func (t *CompressionType) UnmarshalTOML(v interface{}) error {
@@ -492,9 +492,9 @@ func (t CompressionType) MarshalText() ([]byte, error) {
 func (t *CompressionType) FromStringValue(s string) error {
 	switch strings.ToLower(s) {
 	case "":
-		*t = CompressionTypeNone
+		*t = CompressionNone
 	case "gz", "gzip":
-		*t = CompressionTypeGzip
+		*t = CompressionGzip
 	default:
 		return errors.Errorf("invalid compression-type '%s', please choose valid option between ['gzip']", s)
 	}
@@ -511,9 +511,9 @@ func (t *CompressionType) UnmarshalJSON(data []byte) error {
 
 func (t CompressionType) String() string {
 	switch t {
-	case CompressionTypeGzip:
+	case CompressionGzip:
 		return "gzip"
-	case CompressionTypeNone:
+	case CompressionNone:
 		return ""
 	default:
 		panic(fmt.Sprintf("invalid compression type '%d'", t))

br/pkg/lightning/config/config_test.go

@@ -1148,13 +1148,13 @@ func TestCreateSeveralConfigsWithDifferentFilters(t *testing.T) {
 func TestCompressionType(t *testing.T) {
 	var ct config.CompressionType
 	require.NoError(t, ct.FromStringValue(""))
-	require.Equal(t, config.CompressionTypeNone, ct)
+	require.Equal(t, config.CompressionNone, ct)
 	require.NoError(t, ct.FromStringValue("gzip"))
-	require.Equal(t, config.CompressionTypeGzip, ct)
+	require.Equal(t, config.CompressionGzip, ct)
 	require.NoError(t, ct.FromStringValue("gz"))
-	require.Equal(t, config.CompressionTypeGzip, ct)
+	require.Equal(t, config.CompressionGzip, ct)
 	require.EqualError(t, ct.FromStringValue("zstd"), "invalid compression-type 'zstd', please choose valid option between ['gzip']")
 
-	require.Equal(t, "", config.CompressionTypeNone.String())
-	require.Equal(t, "gzip", config.CompressionTypeGzip.String())
+	require.Equal(t, "", config.CompressionNone.String())
+	require.Equal(t, "gzip", config.CompressionGzip.String())
 }