From 9274186a1b18a015c40255e5ad94246bf0b2683a Mon Sep 17 00:00:00 2001
From: saikumar-vs <112166980+saikumar-vs@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:53:00 +0530
Subject: [PATCH] Fix's for PSMDB and SSL setup (#685)
---
pmm-tests/psmdb_setup.yml | 18 ++++++++++++------
.../tls-ssl-setup/mysql/mysql_ssl_setup.sh | 1 +
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pmm-tests/psmdb_setup.yml b/pmm-tests/psmdb_setup.yml
index d051a471..c43cb7ad 100644
--- a/pmm-tests/psmdb_setup.yml
+++ b/pmm-tests/psmdb_setup.yml
@@ -46,7 +46,7 @@
- name: Setup psmdb for monitoring
shell: "{{ item }}"
with_items:
- - docker exec {{ psmdb_container }} bash -x ./psmdb_setup.sh --mongodb_version {{ psmdb_version }} --mongodb_setup {{ psmdb_setup }} > ~/setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
+ - docker exec {{ psmdb_container }} bash -x ./psmdb_setup.sh --mongodb_version {{ psmdb_version }} --mongodb_setup {{ psmdb_setup }} > setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
- name: Setup Load Running Docker Container
shell: "{{ item }}"
@@ -62,20 +62,26 @@
shell: docker exec {{ psmdb_container }} ./nodes/cl.sh mongodb_user_setup.js
when: psmdb_setup == "regular"
- - name: Run load on Replica Set Master
+ - name: Run load on Replica Set Master (PSS)
shell: "{{ item }}"
with_items:
- - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27018 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php
- when: psmdb_setup == "replica" or psmdb_setup == "arbiter"
+ - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27018 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php >> setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
+ when: psmdb_setup == "replica"
+
+ - name: Run load on Replica Set Master (PSA)
+ shell: "{{ item }}"
+ with_items:
+ - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27018 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 -e MONGODB_USER="dba" -e MONGODB_PASSWORD="test1234" --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php >> setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
+ when: psmdb_setup == "arbiter"
- name: Run load on Regular
shell: "{{ item }}"
with_items:
- - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27017 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php
+ - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27017 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php >> setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
when: psmdb_setup == "regular"
- name: Run load on Sharded Clusters Master
shell: "{{ item }}"
with_items:
- - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27019 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php
+ - docker run --name mongodb_load_{{ psmdb_version }}_{{ psmdb_setup }} -d -e MONGODB_HOST={{ psmdb_container }} -e MONGODB_PORT=27019 -e TEST_TARGET_QPS=10 -e TEST_COLLECTION=10 -e TEST_DB=30 --network=pmm-qa -v $(pwd):/usr/src/myapp -w /usr/src/myapp php-db php mongodb_query.php >> setup_psmdb_{{ psmdb_version }}_{{ psmdb_setup }}.log
when: psmdb_setup == "sharded"
diff --git a/pmm-tests/tls-ssl-setup/mysql/mysql_ssl_setup.sh b/pmm-tests/tls-ssl-setup/mysql/mysql_ssl_setup.sh
index 69db1dcd..388f1767 100644
--- a/pmm-tests/tls-ssl-setup/mysql/mysql_ssl_setup.sh
+++ b/pmm-tests/tls-ssl-setup/mysql/mysql_ssl_setup.sh
@@ -89,4 +89,5 @@ fi
service mysql restart
mysql -e "create user pmm@'%' identified by \"pmm\""
mysql -e "grant all on *.* to pmm@'%'"
+mysql -e "CREATE USER 'pmm_tls'@'%' REQUIRE X509"
service mysql restart