diff --git a/docs/releases/UPGRADE_0.38.0.md b/docs/releases/UPGRADE_0.38.0.md index c733fd3e..83186a38 100644 --- a/docs/releases/UPGRADE_0.38.0.md +++ b/docs/releases/UPGRADE_0.38.0.md @@ -154,14 +154,14 @@ done echo "Replication migration completed successfully on $MARIADB_NAME instance." ``` -For better convenience, you can run: +For better convenience, replace the variables and run: ```bash curl -sLO https://raw.githubusercontent.com/mariadb-operator/mariadb-operator/refs/heads/main/hack/migrate_repl_conn.sh chmod +x migrate_repl_conn.sh -MARIADB_NAME="" \ -MARIADB_NAMESPACE="" \ -MARIADB_ROOT_PASSWORD="" \ +MARIADB_NAME='' \ +MARIADB_NAMESPACE='' \ +MARIADB_ROOT_PASSWORD='' \ ./migrate_repl_conn.sh ``` \ No newline at end of file diff --git a/hack/migrate_repl_conn.sh b/hack/migrate_repl_conn.sh index bccac158..d7ddd188 100755 --- a/hack/migrate_repl_conn.sh +++ b/hack/migrate_repl_conn.sh @@ -23,10 +23,10 @@ function wait_for_ready_replication { while [[ $elapsed -lt $timeout ]]; do local status - status=$(exec_sql "$pod" "SHOW REPLICA STATUS\G" | tee /tmp/replication_status_$pod.txt) + status=$(exec_sql "$pod" "SHOW REPLICA STATUS\G" | tee /tmp/replication_status_$pod_$MARIADB_NAMESPACE.txt) - if grep -q "Slave_IO_Running: Yes" /tmp/replication_status_$pod.txt && \ - grep -q "Slave_SQL_Running: Yes" /tmp/replication_status_$pod.txt; then + if grep -q "Slave_IO_Running: Yes" /tmp/replication_status_$pod_$MARIADB_NAMESPACE.txt && \ + grep -q "Slave_SQL_Running: Yes" /tmp/replication_status_$pod_$MARIADB_NAMESPACE.txt; then echo "Replication is ready on $pod." return 0 fi @@ -44,8 +44,6 @@ echo "Migrating replication on $MARIADB_NAME instance..." PODS=$(kubectl get pods -n "$MARIADB_NAMESPACE" -l app.kubernetes.io/instance=$MARIADB_NAME -o jsonpath="{.items[*].metadata.name}") PRIMARY_POD=$(kubectl get mariadb "$MARIADB_NAME" -n "$MARIADB_NAMESPACE" -o jsonpath="{.status.currentPrimary}") -echo "Primary pod detected: $PRIMARY_POD" -echo "Replica pods: $PODS" for POD in $PODS; do if [[ "$POD" == "$PRIMARY_POD" ]]; then