PMM-12659 create more DBs for pdpgsql (#650)

* PMM-12659 create more DBs for pdpgsql * Update pmm-framework.sh
percona · Nov 24, 2023 · dc631fb · dc631fb
1 parent 48f03d7
commit dc631fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/pmm-integration/postgres/addClientPdPgsql.ts b/pmm-integration/postgres/addClientPdPgsql.ts
@@ -30,6 +30,12 @@ const addClientPdPgsql = async (parameters: SetupParameters, numberOfClients: nu
     await executeCommand(`sudo docker network connect ${dockerNetworkName} ${containerName}`);
     await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'create extension pg_stat_monitor'`);
     await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'SELECT pg_reload_conf();'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test1;'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test2;'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test3;'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test4;'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test5;'`);
+    await executeCommand(`sudo docker exec ${containerName} psql -h localhost -U postgres -c 'CREATE DATABASE test6;'`);
     const prefix = parameters.ci ? 'sudo ' : `sudo docker exec ${pmmIntegrationClientName} `;
     const serviceAddress = parameters.ci ? `127.0.0.1:${pdpgsql_port + index}` : `${containerName}:5432`;
 

diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh
@@ -1498,6 +1498,12 @@ add_clients(){
         sleep 20
         docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'create extension pg_stat_monitor'
         docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'SELECT pg_reload_conf();'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test1;'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test2;'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test3;'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test4;'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test5;'
+        docker exec $pdpgsql_service_name psql -h localhost -U postgres -c 'CREATE DATABASE test6;'
         if [ $(( ${j} % 2 )) -eq 0 ]; then
           if [[ ! -z $metrics_mode ]]; then
             pmm-admin add postgresql --username=postgres --password=${PDPGSQL_PASSWORD} --environment=pdpgsql-prod --cluster=pdpgsql-prod-cluster --metrics-mode=$metrics_mode --query-source=pgstatmonitor --replication-set=pdpgsql-repl2 $pdpgsql_service_name localhost:$PDPGSQL_PORT
@@ -3060,7 +3066,7 @@ setup_mongo_replica_for_backup() {
   fi
   mkdir /tmp/backup_data && chmod 777 /tmp/backup_data
   pushd qa-integration/pmm_psmdb-pbm_setup
-  PSMDB_VERSION=7.0.2-1 COMPOSE_PROFILES=extra ./start-rs-only.sh
+  PSMDB_VERSION=6.0.11-8 COMPOSE_PROFILES=extra ./start-rs-only.sh
   popd
   popd
 }