Skip to content

Update from stage cluster #24

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.

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

Merged
merged 23 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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/sych74/mysql-cluster/JE-59466-new
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

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

Expand Down
3 changes: 2 additions & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ categories:
- apps/clustered-dbs
- apps/popular
- apps/clusters
- apps/databases

description:
text: "/texts/description.md?_r=1"
Expand All @@ -16,7 +17,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1

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

baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

settings:
fields:
Expand Down
1 change: 1 addition & 0 deletions scripts/common.yml
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/stage-cluster
customConfigFile: /etc/mysql/conf.d/my_custom.cnf

actions:
Expand Down
1 change: 1 addition & 0 deletions scripts/galera.jps
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ actions:
[ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
[ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
[ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
[ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
pgrep mysql 1>/dev/null && pkill -9 mysql;
pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
user: root
Expand Down
2 changes: 1 addition & 1 deletion scripts/master-master.jps
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-master-master-replication-cluster
name: MySQL/MariaDB/Percona Primary-Primary Replication Database Cluster
description: 'DB Auto Clustering: 1 x Primary + N x Secondary'

baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

success:
text: /texts/phpmyadmin-credentials.md
Expand Down
2 changes: 1 addition & 1 deletion scripts/master-slave.jps
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster
name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster
description: 'DB Auto Clustering: 1 x Primary + N x Secondary'

baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new
baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster

success:
text: /texts/phpmyadmin-credentials.md
Expand Down
10 changes: 0 additions & 10 deletions scripts/proxy-galera.jps
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ onAfterClone:
db_user: ${globals.DB_USER}
db_pass: ${globals.DB_PASS}

onBeforeRemoveNode[proxy]:
stopEvent:
type: warning
message: Scaling is not supported for ProxySQL.

onBeforeAddNode[proxy]:
stopEvent:
type: warning
message: Scaling is not supported for ProxySQL.

onInstall:
- getReplicaUser
- resetProxyNodes
Expand Down
10 changes: 0 additions & 10 deletions scripts/proxy-master-slave.jps
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ globals:
ADMIN_USER: admin-${fn.random}
ADMIN_PASS: ${fn.password(10)}
MAX_REPL_LAG: 20

onBeforeRemoveNode[proxy]:
stopEvent:
type: warning
message: Scaling is not supported for ProxySQL.

onBeforeAddNode[proxy]:
stopEvent:
type: warning
message: Scaling is not supported for ProxySQL.

onAfterScaleOut[sqldb]:
forEach(event.response.nodes):
Expand Down
1 change: 1 addition & 0 deletions scripts/xtradb.jps
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ actions:
[ -f /var/lib/mysql/grastate.dat ] && rm -f /var/lib/mysql/grastate.dat
[ -f /var/lib/mysql/gvwstate.dat ] && rm -f /var/lib/mysql/gvwstate.dat
[ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache
[ -f /var/lib/mysql/tc.log ] && rm -f /var/lib/mysql/tc.log
pgrep mysql 1>/dev/null && pkill -9 mysql;
pgrep mariadb 1>/dev/null && pkill -9 mariadb || true
user: root
Expand Down