percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-14 23:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-1865 small changes

Browse Source
This commit is contained in:
Max Dudin
2020-08-04 00:00:54 +03:00
parent 9b90408451
commit 212d2032ed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/go/pt-k8s-debug-collector/dumper/dumper.go
View File

@@ -212,7 +212,7 @@ func (d *Dumper) runCmd(args ...string) ([]byte, error) {
cmd.Stderr = &errb cmd.Stderr = &errb
err := cmd.Run() err := cmd.Run()
if err != nil || errb.Len() > 0 { if err != nil || errb.Len() > 0 {
return nil, errors.Errorf("error: %v, stderr: %s, stdout: %s", err, errb, outb) return nil, errors.Errorf("error: %v, stderr: %s, stdout: %s", err, errb.String(), outb.String())
} }
return outb.Bytes(), nil return outb.Bytes(), nil
@@ -321,10 +321,10 @@ func (d *Dumper) getPTSummury(resource, podName, crName string, tw *tar.Writer)
cmd.Stderr = &errb cmd.Stderr = &errb
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
return nil, errors.Errorf("error: %v, stderr: %s, stdout: %s", err, errb, outb) return nil, errors.Errorf("error: %v, stderr: %s, stdout: %s", err, errb.String(), outb.String())
} }
return []byte(fmt.Sprintf("stderr: %s, stdout: %s", errb, outb)), nil return []byte(fmt.Sprintf("stderr: %s, stdout: %s", errb.String(), outb.String())), nil
} }
func (d *Dumper) getCR(crName string) (crSecrets, error) { func (d *Dumper) getCR(crName string) (crSecrets, error) {