Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-16 02:07:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace hard-coded snapshot dirs with ETCD_SNAPSHOTS_DIR in libetcd.sh (#30001)

Browse Source 
Signed-off-by: Brad Klein <bklein@cray.com>
Co-authored-by: Brad Klein <bklein@cray.com>
This commit is contained in:
Brad Klein
2023-04-24 09:47:14 -06:00
committed by GitHub
parent 031db90810
commit 126fc81f80
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bitnami/etcd/3.3/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
View File

@@ -443,26 +443,26 @@ is_healthy_etcd_cluster() {
export ETCD_ACTIVE_ENDPOINTS
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
if [[ -f "/snapshots/.disaster_recovery" ]]; then
if [[ -f "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" ]]; then
# Remove current node from the ones that need to recover
remove_in_file "/snapshots/.disaster_recovery" "$host:$port"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$host:$port"
# Remove nodes that do not exist anymore from the ones that need to recover
read -r -a recovery_array <<<"$(tr '\n' ' ' <"/snapshots/.disaster_recovery")"
read -r -a recovery_array <<<"$(tr '\n' ' ' <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery")"
for r in "${recovery_array[@]}"; do
if [[ ! "${endpoints_array[*]}" =~ $r ]]; then
remove_in_file "/snapshots/.disaster_recovery" "$r"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$r"
fi
done
if [[ $(wc -w <"/snapshots/.disaster_recovery") -eq 0 ]]; then
if [[ $(wc -w <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery") -eq 0 ]]; then
debug "Last member to recover from the disaster!"
rm "/snapshots/.disaster_recovery"
rm "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
fi
return_value=1
else
if [[ $active_endpoints -lt $(((cluster_size + 1) / 2)) ]]; then
debug "There are no enough active endpoints!"
for e in "${endpoints_array[@]}"; do
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"/snapshots/.disaster_recovery"
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
done
return_value=1
fi
@@ -669,7 +669,7 @@ etcd_initialize() {
if ! is_healthy_etcd_cluster; then
warn "Cluster not responding!"
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
latest_snapshot_file="$(find /snapshots/ -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
latest_snapshot_file="$(find "${ETCD_SNAPSHOTS_DIR}/" -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
if [[ "${latest_snapshot_file}" != "" ]]; then
info "Restoring etcd cluster from snapshot"
rm -rf "$ETCD_DATA_DIR"

16
bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
View File

@@ -443,26 +443,26 @@ is_healthy_etcd_cluster() {
export ETCD_ACTIVE_ENDPOINTS
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
if [[ -f "/snapshots/.disaster_recovery" ]]; then
if [[ -f "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" ]]; then
# Remove current node from the ones that need to recover
remove_in_file "/snapshots/.disaster_recovery" "$host:$port"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$host:$port"
# Remove nodes that do not exist anymore from the ones that need to recover
read -r -a recovery_array <<<"$(tr '\n' ' ' <"/snapshots/.disaster_recovery")"
read -r -a recovery_array <<<"$(tr '\n' ' ' <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery")"
for r in "${recovery_array[@]}"; do
if [[ ! "${endpoints_array[*]}" =~ $r ]]; then
remove_in_file "/snapshots/.disaster_recovery" "$r"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$r"
fi
done
if [[ $(wc -w <"/snapshots/.disaster_recovery") -eq 0 ]]; then
if [[ $(wc -w <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery") -eq 0 ]]; then
debug "Last member to recover from the disaster!"
rm "/snapshots/.disaster_recovery"
rm "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
fi
return_value=1
else
if [[ $active_endpoints -lt $(((cluster_size + 1) / 2)) ]]; then
debug "There are no enough active endpoints!"
for e in "${endpoints_array[@]}"; do
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"/snapshots/.disaster_recovery"
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
done
return_value=1
fi
@@ -669,7 +669,7 @@ etcd_initialize() {
if ! is_healthy_etcd_cluster; then
warn "Cluster not responding!"
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
latest_snapshot_file="$(find /snapshots/ -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
latest_snapshot_file="$(find "${ETCD_SNAPSHOTS_DIR}/" -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
if [[ "${latest_snapshot_file}" != "" ]]; then
info "Restoring etcd cluster from snapshot"
rm -rf "$ETCD_DATA_DIR"

16
bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
View File

@@ -443,26 +443,26 @@ is_healthy_etcd_cluster() {
export ETCD_ACTIVE_ENDPOINTS
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
if [[ -f "/snapshots/.disaster_recovery" ]]; then
if [[ -f "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" ]]; then
# Remove current node from the ones that need to recover
remove_in_file "/snapshots/.disaster_recovery" "$host:$port"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$host:$port"
# Remove nodes that do not exist anymore from the ones that need to recover
read -r -a recovery_array <<<"$(tr '\n' ' ' <"/snapshots/.disaster_recovery")"
read -r -a recovery_array <<<"$(tr '\n' ' ' <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery")"
for r in "${recovery_array[@]}"; do
if [[ ! "${endpoints_array[*]}" =~ $r ]]; then
remove_in_file "/snapshots/.disaster_recovery" "$r"
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$r"
fi
done
if [[ $(wc -w <"/snapshots/.disaster_recovery") -eq 0 ]]; then
if [[ $(wc -w <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery") -eq 0 ]]; then
debug "Last member to recover from the disaster!"
rm "/snapshots/.disaster_recovery"
rm "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
fi
return_value=1
else
if [[ $active_endpoints -lt $(((cluster_size + 1) / 2)) ]]; then
debug "There are no enough active endpoints!"
for e in "${endpoints_array[@]}"; do
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"/snapshots/.disaster_recovery"
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
done
return_value=1
fi
@@ -669,7 +669,7 @@ etcd_initialize() {
if ! is_healthy_etcd_cluster; then
warn "Cluster not responding!"
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
latest_snapshot_file="$(find /snapshots/ -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
latest_snapshot_file="$(find "${ETCD_SNAPSHOTS_DIR}/" -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
if [[ "${latest_snapshot_file}" != "" ]]; then
info "Restoring etcd cluster from snapshot"
rm -rf "$ETCD_DATA_DIR"