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

Je 70722 #348

Open
wants to merge 9 commits into
base: v3.0.0
Choose a base branch
from
Open

Je 70722 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
269e47b
JE-68221
sych74 Oct 30, 2023
3d50387
Merge branch 'jelastic-jps:v3.0.0' into v3.0.0
sych74 Nov 13, 2023
b6b7608
JE-67893
sych74 Nov 23, 2023
5c169d1
JE-67893
sych74 Nov 23, 2023
1044d71
Update proxy-common.yml
sych74 Jan 23, 2024
a3641c7
baseUrl
sych74 Feb 28, 2024
94874ff
baseUrl
sych74 Feb 28, 2024
8374cd1
JE-70722
sych74 Mar 5, 2024
6ab2a81
JE-70722
sych74 Mar 5, 2024
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: 1 addition & 1 deletion addons/auto-clustering/auto-cluster.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description:
healthcheck and autodiscovery of newly added DB nodes
short: Scalable MySQL cluster with ProxySQL for even load distribution

baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-70722

logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png

Expand Down
2 changes: 1 addition & 1 deletion manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1

onBeforeInit: /scripts/settings.js?_r=${fn.random}

baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-70722

settings:
fields:
Expand Down
5 changes: 3 additions & 2 deletions scripts/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
globals:
db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0
customConfigFile: /etc/mysql/conf.d/my_custom.cnf

actions:
Expand Down Expand Up @@ -74,7 +75,7 @@ actions:

setupAdminUser:
- cmd[${this.id}]: |-
wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
wget ${globals.db_cluster_path}/scripts/setupUser.sh -O ~/setupUser.sh;
bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;
user: root

Expand All @@ -87,7 +88,7 @@ actions:
pswd: ${globals.REPLICA_PSWD}

addCustomConfig:
- cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log;
- cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile};
- env.file.AddFavorite:
nodeGroup: sqldb
path: ${globals.customConfigFile}
Expand Down
1 change: 1 addition & 0 deletions scripts/galera.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ actions:
[ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
pgrep mysql 1>/dev/null && pkill -9 mysql;
pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
systemctl reset-failed
user: root

restartNodesInOrder:
Expand Down
5 changes: 4 additions & 1 deletion scripts/proxy-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
globals:
db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0

actions:
setupOrchestrator:
- log: Orchestrator configuration
Expand All @@ -11,7 +14,7 @@ actions:
mysql -h 127.0.0.1 -P3360 -uroot -e "SET PASSWORD FOR 'admin'@'127.0.0.1' = PASSWORD('${globals.ORCH_PASS}');"
fi
mysql -h 127.0.0.1 -P3360 -uroot -e "FLUSH PRIVILEGES;"
wget ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
wget ${globals.db_cluster_path}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log
sed -i -e 's|orc_client_user|${globals.DB_USER}|g' /etc/orchestrator.conf.json
sed -i -e 's|orc_client_password|${globals.DB_PASS}|g' /etc/orchestrator.conf.json
sed -i -e 's|orc_server_user|admin|g' /etc/orchestrator.conf.json
Expand Down
1 change: 1 addition & 0 deletions scripts/xtradb.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ actions:
[ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
pgrep mysql 1>/dev/null && pkill -9 mysql;
pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
systemctl reset-failed
user: root

restartNodesInOrder:
Expand Down