Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lightning: support compression when sending kv pairs to tikv #41164

Merged
merged 18 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
sleepymole committed Feb 8, 2023
commit 1c3c845c802a7930d6d960136f5ced66502eac6f
12 changes: 9 additions & 3 deletions br/pkg/lightning/backend/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand All @@ -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() {
Expand All @@ -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)
}
Expand Down
16 changes: 8 additions & 8 deletions br/pkg/lightning/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}
Expand All @@ -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))
Expand Down
10 changes: 5 additions & 5 deletions br/pkg/lightning/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}