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.

Sign up for GitHub

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

Jump to bottom

br: revert wrong commits #43589

Merged
merged 2 commits into from
May 8, 2023
Merged

br: revert wrong commits #43589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6738972
Revert "make clippy happy"
YuJuncen May 6, 2023
e66e0f1
Revert "implementated basic pause-gc"
YuJuncen May 6, 2023
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
2 changes: 0 additions & 2 deletions br/cmd/br/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ go_library(
"cmd.go",
"debug.go",
"main.go",
"operator.go",
"restore.go",
"stream.go",
],
Expand All @@ -27,7 +26,6 @@ go_library(
"//br/pkg/streamhelper/config",
"//br/pkg/summary",
"//br/pkg/task",
"//br/pkg/task/operator",
"//br/pkg/trace",
"//br/pkg/utils",
"//br/pkg/version/build",
Expand Down
1 change: 0 additions & 1 deletion br/cmd/br/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func main() {
NewBackupCommand(),
NewRestoreCommand(),
NewStreamCommand(),
newOpeartorCommand(),
)
// Outputs cmd.Print to stdout.
rootCmd.SetOut(os.Stdout)
Expand Down
49 changes: 0 additions & 49 deletions br/cmd/br/operator.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion br/pkg/pdutil/pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func NewPdController(
}
if failure != nil {
return nil, errors.Annotatef(berrors.ErrPDUpdateFailed,
"pd address (%s) not available, error is %s, please check network", pdAddrs, failure)
"pd address (%s) not available, please check network", pdAddrs)
}

version := parseVersion(versionBytes)
Expand Down
9 changes: 0 additions & 9 deletions br/pkg/task/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,6 @@ func (tls *TLSConfig) ToTLSConfig() (*tls.Config, error) {
return tlsConfig, nil
}

// Convert the TLS config to the PD security option.
func (tls *TLSConfig) ToPDSecurityOption() pd.SecurityOption {
securityOption := pd.SecurityOption{}
securityOption.CAPath = tls.CA
securityOption.CertPath = tls.Cert
securityOption.KeyPath = tls.Key
return securityOption
}

// ParseFromFlags parses the TLS config from the flag set.
func (tls *TLSConfig) ParseFromFlags(flags *pflag.FlagSet) (err error) {
tls.CA, tls.Cert, tls.Key, err = ParseTLSTripleFromFlags(flags)
Expand Down
19 changes: 0 additions & 19 deletions br/pkg/task/operator/BUILD.bazel
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions br/pkg/task/operator/cmd.go
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions br/pkg/task/operator/config.go
View file
Open in desktop

This file was deleted.