Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

cherry-pick important features to release-4.0 branch #622

Merged
merged 9 commits into from
Nov 27, 2020

Conversation

lichunzhu
Copy link
Contributor

What problem does this PR solve?

Some PRs are not cherry-picked to release-4.0.

What is changed and how it works?

cherry-pick important features to release-4.0 branch

Check List

Tests

  • Unit test
  • Integration test

Release Note

  • No release note

lichunzhu and others added 3 commits November 26, 2020 17:58
* fix: backup will skip empty databases.

* fix typo.

Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
Co-authored-by: 3pointer <luancheng@pingcap.com>
Co-authored-by: kennytm <kennytm@gmail.com>
@overvenus
Copy link
Member

LGTM

@ti-srebot ti-srebot added the status/LGT1 LGTM1 label Nov 26, 2020
@overvenus
Copy link
Member

Please update kvproto to latest release-4.0

@lichunzhu lichunzhu marked this pull request as ready for review November 26, 2020 12:23
@kennytm
Copy link
Collaborator

kennytm commented Nov 26, 2020

[2020-11-26T12:59:45.264Z] Files errors.toml and /tmp/errors.toml.before differ

go.mod Outdated
@@ -4,35 +4,43 @@ go 1.13

require (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ignore go.mod

go.mod1 Outdated
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/common v0.9.1
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/tikv/pd v1.1.0-beta.0.20200910042021-254d1345be09
github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285 // indirect
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove indirect dependencies.

pkg/conn/conn.go Outdated
Comment on lines 21 to 23
"google.golang.org/grpc/keepalive"

"github.com/pingcap/kvproto/pkg/backup"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"google.golang.org/grpc/keepalive"
"github.com/pingcap/kvproto/pkg/backup"
"google.golang.org/grpc/keepalive"
"github.com/pingcap/kvproto/pkg/backup"

@lichunzhu
Copy link
Contributor Author

/rebuild

Copy link
Collaborator

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot removed the status/LGT1 LGTM1 label Nov 27, 2020
@ti-srebot ti-srebot added the status/LGT2 LGTM2 label Nov 27, 2020
@overvenus
Copy link
Member

LGTM

@overvenus overvenus merged commit 1d3fb98 into pingcap:release-4.0 Nov 27, 2020
@lichunzhu lichunzhu deleted the cherryPickToRelease4 branch November 27, 2020 05:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants