percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-09 17:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #764 from jobinau/3.x

Browse Source 
All complexities and failure senarios are removed, No more dependancies
This commit is contained in:
Sveta Smirnova
2024-02-17 20:35:20 +03:00
committed by GitHub
parent 1462c4e4af 91209b5837
commit 37d792f299
2 changed files with 9 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,76 +422,14 @@ func (d *Dumper) getPodSummary(resource, podName, crName string, namespace strin
ports = port + ":3306"
summCmdName = "pt-mysql-summary"
summCmdArgs = []string{"--host=127.0.0.1", "--port=" + port, "--user=root", "--password='" + string(pass) + "'"}
case "pg":
var user, pass, port string
if d.forwardport != "" {
port = d.forwardport
} else {
port = "5432"
case "pg","pgv2":
var kubeconfig string=""
if d.kubeconfig != "" {
kubeconfig=" --kubeconfig=" + d.kubeconfig
}
cr, err := d.getCR("pgclusters", namespace)
if err != nil {
return nil, errors.Wrap(err, "get cr")
}
if cr.Spec.SecretName != "" {
user, err = d.getDataFromSecret(cr.Spec.SecretName, "username", namespace)
} else {
user, err = d.getDataFromSecret(crName+"-postgres-secret", "username", namespace)
}
if err != nil {
return nil, errors.Wrap(err, "get user from PostgreSQL users secret")
}
if cr.Spec.SecretName != "" {
pass, err = d.getDataFromSecret(cr.Spec.SecretName, "password", namespace)
} else {
pass, err = d.getDataFromSecret(crName+"-postgres-secret", "password", namespace)
}
if err != nil {
return nil, errors.Wrap(err, "get password from PostgreSQL users secret")
}
ports = port + ":5432"
summCmdName = "sh"
summCmdArgs = []string{"-c", "curl https://raw.githubusercontent.com/percona/support-snippets/master/postgresql/pg_gather/gather.sql" +
" 2>/dev/null | PGPASSWORD='" + string(pass) + "' psql -X --host=127.0.0.1 --port=" + port + " --user='" + user + "'"}
case "pgv2":
var user, pass, port string
if d.forwardport != "" {
port = d.forwardport
} else {
port = "5432"
}
cr, err := d.getCR("perconapgclusters/"+crName, namespace)
if err != nil {
return nil, errors.Wrap(err, "get cr")
}
if cr.Spec.SecretName != "" {
user, err = d.getDataFromSecret(cr.Spec.SecretName, "user", namespace)
} else if len(cr.Spec.Users) > 0 && cr.Spec.Users[0].Name != "" {
user = cr.Spec.Users[0].Name
} else {
user, err = d.getDataFromSecret(crName+"-pguser-"+crName, "user", namespace)
}
if err != nil {
return nil, errors.Wrap(err, "get user from PostgreSQL users secret")
}
if cr.Spec.SecretName != "" {
pass, err = d.getDataFromSecret(cr.Spec.SecretName, "password", namespace)
} else if len(cr.Spec.Users) > 0 {
if cr.Spec.Users[0].SecretName != "" {
pass, err = d.getDataFromSecret(cr.Spec.Users[0].SecretName, "password", namespace)
} else {
pass, err = d.getDataFromSecret(crName+"-pguser-"+user, "password", namespace)
}
} else {
pass, err = d.getDataFromSecret(crName+"-pguser-"+crName, "password", namespace)
}
if err != nil {
return nil, errors.Wrap(err, "get password from PostgreSQL users secret")
}
ports = port + ":5432"
summCmdName = "sh"
summCmdArgs = []string{"-c", "curl https://raw.githubusercontent.com/percona/support-snippets/master/postgresql/pg_gather/gather.sql" +
" 2>/dev/null | PGPASSWORD='" + string(pass) + "' psql -X --host=127.0.0.1 --port=" + port + " --user='" + user + "'"}
summCmdArgs = []string{"-c", "curl https://raw.githubusercontent.com/percona/support-snippets/master/postgresql/pg_gather/gather.sql 2>/dev/null | " +
d.cmd + kubeconfig + " -n "+ namespace + " exec -i "+ podName +" -- psql -X -f - "}
case "psmdb":
var port string
if d.forwardport != "" {

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

@@ -244,11 +244,11 @@ func TestPT_2169(t *testing.T) {
kubeconfig string
}{
{
name: "pg with busy port",
resource: "pg",
name: "pxc with busy port",
resource: "pxc",
want: "3",
port: busyport,
kubeconfig: os.Getenv("KUBECONFIG_PG"),
kubeconfig: os.Getenv("KUBECONFIG_PXC"),
},
{
name: "pg no error",