Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-23 14:57:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow IPS on DB_GALERA_CLUSTER_ADDRESS (#66)

Browse Source
This commit is contained in:
Juan Ariza Toledano
2021-10-28 19:43:00 +02:00
committed by GitHub
parent db00839832
commit 2cc521ceb7
5 changed files with 175 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitnami/mariadb-galera/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
View File

@@ -97,11 +97,11 @@ get_galera_cluster_bootstrap_value() {
elif is_boolean_yes "$DB_GALERA_CLUSTER_BOOTSTRAP"; then
cluster_bootstrap="yes"
elif is_boolean_yes "$(get_previous_boot)"; then
cluster_bootstrap="yes"
cluster_bootstrap="no"
elif ! is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
cluster_bootstrap="yes"
else
cluster_bootstrap="yes"
cluster_bootstrap="no"
fi
echo "$cluster_bootstrap"
}
@@ -116,6 +116,7 @@ get_galera_cluster_bootstrap_value() {
# None
#########################
has_galera_cluster_other_nodes() {
local local_ip
local node_ip
local cluster_address
local has_nodes

78
bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
View File

@@ -6,6 +6,7 @@
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/libnet.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libservice.sh
. /opt/bitnami/scripts/libvalidations.sh
@@ -80,9 +81,7 @@ mysql_extra_flags() {
# None
#########################
get_galera_cluster_bootstrap_value() {
local clusterBootstrap
local local_ip
local host_ip
local cluster_bootstrap
# This block evaluate if the cluster needs to be boostraped or not.
# When the node is marked to bootstrap:
@@ -94,17 +93,17 @@ get_galera_cluster_bootstrap_value() {
# - Users can force a bootstrap to happen again on a node, by setting the environment variable "MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP".
# When the node is not marked to bootstrap, the node will join an existing cluster.
if is_boolean_yes "$DB_GALERA_FORCE_SAFETOBOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$DB_GALERA_CLUSTER_BOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$(get_previous_boot)"; then
clusterBootstrap="no"
cluster_bootstrap="no"
elif ! is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
else
clusterBootstrap="no"
cluster_bootstrap="no"
fi
echo "$clusterBootstrap"
echo "$cluster_bootstrap"
}
########################
@@ -118,37 +117,46 @@ get_galera_cluster_bootstrap_value() {
#########################
has_galera_cluster_other_nodes() {
local local_ip
local host_ip
local clusterAddress
local hasNodes
local node_ip
local cluster_address
local has_nodes
hasNodes="yes"
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$clusterAddress" ]]; then
hasNodes="no"
elif [[ -n "$clusterAddress" ]]; then
hasNodes="no"
has_nodes="yes"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$cluster_address" ]]; then
has_nodes="no"
elif [[ -n "$cluster_address" ]]; then
has_nodes="no"
local_ip=$(hostname -i)
read -r -a hosts <<< "$(tr ',' ' ' <<< "${clusterAddress#*://}")"
if [[ "${#hosts[@]}" -eq "1" ]]; then
read -r -a cluster_ips <<< "$(getent hosts "${hosts[0]}" | awk '{print $1}' | tr '\n' ' ')"
if [[ "${#cluster_ips[@]}" -gt "1" ]] || ( [[ "${#cluster_ips[@]}" -eq "1" ]] && [[ "${cluster_ips[0]}" != "$local_ip" ]] ) ; then
hasNodes="yes"
read -r -a addresses <<< "$(tr ',' ' ' <<< "${cluster_address#*://}")"
if [[ "${#addresses[@]}" -eq "1" ]]; then
if validate_ipv4 "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
hasNodes="no"
if is_hostname_resolved "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
has_nodes="no"
fi
fi
else
hasNodes="no"
for host in "${hosts[@]}"; do
host_ip=$(getent hosts "${host%:*}" | awk '{print $1}')
if [[ -n "$host_ip" ]] && [[ "$host_ip" != "$local_ip" ]]; then
hasNodes="yes"
has_nodes="no"
for a in "${addresses[@]}"; do
address="$(echo "$a" | cut -d':' -f1)"
node_ip=""
if validate_ipv4 "$address"; then
node_ip="$address"
else
is_hostname_resolved "$address" && node_ip="$(dns_lookup "$address")"
fi
if [[ -n "$node_ip" ]] && [[ "$node_ip" != "$local_ip" ]]; then
has_nodes="yes"
break
fi
done
fi
fi
echo "$hasNodes"
echo "$has_nodes"
}
########################
@@ -161,14 +169,14 @@ has_galera_cluster_other_nodes() {
# None
#########################
get_galera_cluster_address_value() {
local clusterAddress
local cluster_address
if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
else
clusterAddress="gcomm://"
cluster_address="gcomm://"
fi
debug "Set Galera cluster address to ${clusterAddress}"
echo "$clusterAddress"
debug "Set Galera cluster address to ${cluster_address}"
echo "$cluster_address"
}
########################

78
bitnami/mariadb-galera/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
View File

@@ -6,6 +6,7 @@
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/libnet.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libservice.sh
. /opt/bitnami/scripts/libvalidations.sh
@@ -80,9 +81,7 @@ mysql_extra_flags() {
# None
#########################
get_galera_cluster_bootstrap_value() {
local clusterBootstrap
local local_ip
local host_ip
local cluster_bootstrap
# This block evaluate if the cluster needs to be boostraped or not.
# When the node is marked to bootstrap:
@@ -94,17 +93,17 @@ get_galera_cluster_bootstrap_value() {
# - Users can force a bootstrap to happen again on a node, by setting the environment variable "MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP".
# When the node is not marked to bootstrap, the node will join an existing cluster.
if is_boolean_yes "$DB_GALERA_FORCE_SAFETOBOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$DB_GALERA_CLUSTER_BOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$(get_previous_boot)"; then
clusterBootstrap="no"
cluster_bootstrap="no"
elif ! is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
else
clusterBootstrap="no"
cluster_bootstrap="no"
fi
echo "$clusterBootstrap"
echo "$cluster_bootstrap"
}
########################
@@ -118,37 +117,46 @@ get_galera_cluster_bootstrap_value() {
#########################
has_galera_cluster_other_nodes() {
local local_ip
local host_ip
local clusterAddress
local hasNodes
local node_ip
local cluster_address
local has_nodes
hasNodes="yes"
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$clusterAddress" ]]; then
hasNodes="no"
elif [[ -n "$clusterAddress" ]]; then
hasNodes="no"
has_nodes="yes"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$cluster_address" ]]; then
has_nodes="no"
elif [[ -n "$cluster_address" ]]; then
has_nodes="no"
local_ip=$(hostname -i)
read -r -a hosts <<< "$(tr ',' ' ' <<< "${clusterAddress#*://}")"
if [[ "${#hosts[@]}" -eq "1" ]]; then
read -r -a cluster_ips <<< "$(getent hosts "${hosts[0]}" | awk '{print $1}' | tr '\n' ' ')"
if [[ "${#cluster_ips[@]}" -gt "1" ]] || ( [[ "${#cluster_ips[@]}" -eq "1" ]] && [[ "${cluster_ips[0]}" != "$local_ip" ]] ) ; then
hasNodes="yes"
read -r -a addresses <<< "$(tr ',' ' ' <<< "${cluster_address#*://}")"
if [[ "${#addresses[@]}" -eq "1" ]]; then
if validate_ipv4 "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
hasNodes="no"
if is_hostname_resolved "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
has_nodes="no"
fi
fi
else
hasNodes="no"
for host in "${hosts[@]}"; do
host_ip=$(getent hosts "${host%:*}" | awk '{print $1}')
if [[ -n "$host_ip" ]] && [[ "$host_ip" != "$local_ip" ]]; then
hasNodes="yes"
has_nodes="no"
for a in "${addresses[@]}"; do
address="$(echo "$a" | cut -d':' -f1)"
node_ip=""
if validate_ipv4 "$address"; then
node_ip="$address"
else
is_hostname_resolved "$address" && node_ip="$(dns_lookup "$address")"
fi
if [[ -n "$node_ip" ]] && [[ "$node_ip" != "$local_ip" ]]; then
has_nodes="yes"
break
fi
done
fi
fi
echo "$hasNodes"
echo "$has_nodes"
}
########################
@@ -161,14 +169,14 @@ has_galera_cluster_other_nodes() {
# None
#########################
get_galera_cluster_address_value() {
local clusterAddress
local cluster_address
if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
else
clusterAddress="gcomm://"
cluster_address="gcomm://"
fi
debug "Set Galera cluster address to ${clusterAddress}"
echo "$clusterAddress"
debug "Set Galera cluster address to ${cluster_address}"
echo "$cluster_address"
}
########################

78
bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
View File

@@ -6,6 +6,7 @@
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/libnet.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libservice.sh
. /opt/bitnami/scripts/libvalidations.sh
@@ -80,9 +81,7 @@ mysql_extra_flags() {
# None
#########################
get_galera_cluster_bootstrap_value() {
local clusterBootstrap
local local_ip
local host_ip
local cluster_bootstrap
# This block evaluate if the cluster needs to be boostraped or not.
# When the node is marked to bootstrap:
@@ -94,17 +93,17 @@ get_galera_cluster_bootstrap_value() {
# - Users can force a bootstrap to happen again on a node, by setting the environment variable "MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP".
# When the node is not marked to bootstrap, the node will join an existing cluster.
if is_boolean_yes "$DB_GALERA_FORCE_SAFETOBOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$DB_GALERA_CLUSTER_BOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$(get_previous_boot)"; then
clusterBootstrap="no"
cluster_bootstrap="no"
elif ! is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
else
clusterBootstrap="no"
cluster_bootstrap="no"
fi
echo "$clusterBootstrap"
echo "$cluster_bootstrap"
}
########################
@@ -118,37 +117,46 @@ get_galera_cluster_bootstrap_value() {
#########################
has_galera_cluster_other_nodes() {
local local_ip
local host_ip
local clusterAddress
local hasNodes
local node_ip
local cluster_address
local has_nodes
hasNodes="yes"
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$clusterAddress" ]]; then
hasNodes="no"
elif [[ -n "$clusterAddress" ]]; then
hasNodes="no"
has_nodes="yes"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$cluster_address" ]]; then
has_nodes="no"
elif [[ -n "$cluster_address" ]]; then
has_nodes="no"
local_ip=$(hostname -i)
read -r -a hosts <<< "$(tr ',' ' ' <<< "${clusterAddress#*://}")"
if [[ "${#hosts[@]}" -eq "1" ]]; then
read -r -a cluster_ips <<< "$(getent hosts "${hosts[0]}" | awk '{print $1}' | tr '\n' ' ')"
if [[ "${#cluster_ips[@]}" -gt "1" ]] || ( [[ "${#cluster_ips[@]}" -eq "1" ]] && [[ "${cluster_ips[0]}" != "$local_ip" ]] ) ; then
hasNodes="yes"
read -r -a addresses <<< "$(tr ',' ' ' <<< "${cluster_address#*://}")"
if [[ "${#addresses[@]}" -eq "1" ]]; then
if validate_ipv4 "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
hasNodes="no"
if is_hostname_resolved "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
has_nodes="no"
fi
fi
else
hasNodes="no"
for host in "${hosts[@]}"; do
host_ip=$(getent hosts "${host%:*}" | awk '{print $1}')
if [[ -n "$host_ip" ]] && [[ "$host_ip" != "$local_ip" ]]; then
hasNodes="yes"
has_nodes="no"
for a in "${addresses[@]}"; do
address="$(echo "$a" | cut -d':' -f1)"
node_ip=""
if validate_ipv4 "$address"; then
node_ip="$address"
else
is_hostname_resolved "$address" && node_ip="$(dns_lookup "$address")"
fi
if [[ -n "$node_ip" ]] && [[ "$node_ip" != "$local_ip" ]]; then
has_nodes="yes"
break
fi
done
fi
fi
echo "$hasNodes"
echo "$has_nodes"
}
########################
@@ -161,14 +169,14 @@ has_galera_cluster_other_nodes() {
# None
#########################
get_galera_cluster_address_value() {
local clusterAddress
local cluster_address
if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
else
clusterAddress="gcomm://"
cluster_address="gcomm://"
fi
debug "Set Galera cluster address to ${clusterAddress}"
echo "$clusterAddress"
debug "Set Galera cluster address to ${cluster_address}"
echo "$cluster_address"
}
########################

78
bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
View File

@@ -6,6 +6,7 @@
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/libnet.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libservice.sh
. /opt/bitnami/scripts/libvalidations.sh
@@ -80,9 +81,7 @@ mysql_extra_flags() {
# None
#########################
get_galera_cluster_bootstrap_value() {
local clusterBootstrap
local local_ip
local host_ip
local cluster_bootstrap
# This block evaluate if the cluster needs to be boostraped or not.
# When the node is marked to bootstrap:
@@ -94,17 +93,17 @@ get_galera_cluster_bootstrap_value() {
# - Users can force a bootstrap to happen again on a node, by setting the environment variable "MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP".
# When the node is not marked to bootstrap, the node will join an existing cluster.
if is_boolean_yes "$DB_GALERA_FORCE_SAFETOBOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$DB_GALERA_CLUSTER_BOOTSTRAP"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
elif is_boolean_yes "$(get_previous_boot)"; then
clusterBootstrap="no"
cluster_bootstrap="no"
elif ! is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterBootstrap="yes"
cluster_bootstrap="yes"
else
clusterBootstrap="no"
cluster_bootstrap="no"
fi
echo "$clusterBootstrap"
echo "$cluster_bootstrap"
}
########################
@@ -118,37 +117,46 @@ get_galera_cluster_bootstrap_value() {
#########################
has_galera_cluster_other_nodes() {
local local_ip
local host_ip
local clusterAddress
local hasNodes
local node_ip
local cluster_address
local has_nodes
hasNodes="yes"
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$clusterAddress" ]]; then
hasNodes="no"
elif [[ -n "$clusterAddress" ]]; then
hasNodes="no"
has_nodes="yes"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
if [[ -z "$cluster_address" ]]; then
has_nodes="no"
elif [[ -n "$cluster_address" ]]; then
has_nodes="no"
local_ip=$(hostname -i)
read -r -a hosts <<< "$(tr ',' ' ' <<< "${clusterAddress#*://}")"
if [[ "${#hosts[@]}" -eq "1" ]]; then
read -r -a cluster_ips <<< "$(getent hosts "${hosts[0]}" | awk '{print $1}' | tr '\n' ' ')"
if [[ "${#cluster_ips[@]}" -gt "1" ]] || ( [[ "${#cluster_ips[@]}" -eq "1" ]] && [[ "${cluster_ips[0]}" != "$local_ip" ]] ) ; then
hasNodes="yes"
read -r -a addresses <<< "$(tr ',' ' ' <<< "${cluster_address#*://}")"
if [[ "${#addresses[@]}" -eq "1" ]]; then
if validate_ipv4 "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
hasNodes="no"
if is_hostname_resolved "$(echo "${addresses[0]}" | cut -d':' -f1)"; then
has_nodes="yes"
else
has_nodes="no"
fi
fi
else
hasNodes="no"
for host in "${hosts[@]}"; do
host_ip=$(getent hosts "${host%:*}" | awk '{print $1}')
if [[ -n "$host_ip" ]] && [[ "$host_ip" != "$local_ip" ]]; then
hasNodes="yes"
has_nodes="no"
for a in "${addresses[@]}"; do
address="$(echo "$a" | cut -d':' -f1)"
node_ip=""
if validate_ipv4 "$address"; then
node_ip="$address"
else
is_hostname_resolved "$address" && node_ip="$(dns_lookup "$address")"
fi
if [[ -n "$node_ip" ]] && [[ "$node_ip" != "$local_ip" ]]; then
has_nodes="yes"
break
fi
done
fi
fi
echo "$hasNodes"
echo "$has_nodes"
}
########################
@@ -161,14 +169,14 @@ has_galera_cluster_other_nodes() {
# None
#########################
get_galera_cluster_address_value() {
local clusterAddress
local cluster_address
if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
clusterAddress="$DB_GALERA_CLUSTER_ADDRESS"
cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
else
clusterAddress="gcomm://"
cluster_address="gcomm://"
fi
debug "Set Galera cluster address to ${clusterAddress}"
echo "$clusterAddress"
debug "Set Galera cluster address to ${cluster_address}"
echo "$cluster_address"
}
########################