Skip to content

Commit f7f7207

Browse files
pkhartskpkhartsk
committed
Fix run-postgresql-slave script and regenerate distgen files
1 parent 1af4f11 commit f7f7207

File tree

10 files changed

+20
-88
lines changed

10 files changed

+20
-88
lines changed

‎12/root/usr/bin/run-postgresql-slave‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ generate_passwd_file
3131
generate_postgresql_config
3232

3333
wait_for_postgresql_master
34-
export MASTER_FQDN=$(postgresql_master_addr)
34+
export MASTER_FQDN=${POSTGRESQL_MASTER_IP}
3535
initialize_replica
3636

3737
unset_env_vars

‎12/root/usr/share/container-scripts/postgresql/common.sh‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@ function unset_env_vars() {
9191
unset POSTGRESQL_{DATABASE,USER,PASSWORD,ADMIN_PASSWORD}
9292
}
9393

94-
# postgresql_master_addr lookups the 'postgresql-master' DNS and get list of the available
95-
# endpoints. Each endpoint is a PostgreSQL container with the 'master' PostgreSQL running.
96-
function postgresql_master_addr() {
97-
local service_name=${POSTGRESQL_MASTER_SERVICE_NAME:-postgresql-master}
98-
local endpoints=$(dig ${service_name} A +search | grep ";${service_name}" | cut -d ';' -f 2 2>/dev/null)
99-
# FIXME: This is for debugging (docker run)
100-
if [ -v POSTGRESQL_MASTER_IP ]; then
101-
endpoints=${POSTGRESQL_MASTER_IP:-}
102-
fi
103-
if [ -z "$endpoints" ]; then
104-
>&2 echo "Failed to resolve PostgreSQL master IP address"
105-
exit 3
106-
fi
107-
echo -n "$(echo $endpoints | cut -d ' ' -f 1)"
108-
}
109-
11094
# Converts the version in format x.y or x.y.z to a number.
11195
version2number ()
11296
{
@@ -290,12 +274,11 @@ function set_pgdata ()
290274

291275
function wait_for_postgresql_master() {
292276
while true; do
293-
master_fqdn=$(postgresql_master_addr)
294-
echo "Waiting for PostgreSQL master (${master_fqdn}) to accept connections ..."
277+
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_IP}) to accept connections ..."
295278
if [ -v POSTGRESQL_ADMIN_PASSWORD ]; then
296-
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${master_fqdn}" -c "SELECT 1;" && return 0
279+
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_IP}" -c "SELECT 1;" && return 0
297280
else
298-
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${master_fqdn}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
281+
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${POSTGRESQL_MASTER_IP}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
299282
fi
300283
sleep 1
301284
done

‎13/root/usr/bin/run-postgresql-slave‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ generate_passwd_file
3131
generate_postgresql_config
3232

3333
wait_for_postgresql_master
34-
export MASTER_FQDN=$(postgresql_master_addr)
34+
export MASTER_FQDN=${POSTGRESQL_MASTER_IP}
3535
initialize_replica
3636

3737
unset_env_vars

‎13/root/usr/share/container-scripts/postgresql/common.sh‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@ function unset_env_vars() {
9191
unset POSTGRESQL_{DATABASE,USER,PASSWORD,ADMIN_PASSWORD}
9292
}
9393

94-
# postgresql_master_addr lookups the 'postgresql-master' DNS and get list of the available
95-
# endpoints. Each endpoint is a PostgreSQL container with the 'master' PostgreSQL running.
96-
function postgresql_master_addr() {
97-
local service_name=${POSTGRESQL_MASTER_SERVICE_NAME:-postgresql-master}
98-
local endpoints=$(dig ${service_name} A +search | grep ";${service_name}" | cut -d ';' -f 2 2>/dev/null)
99-
# FIXME: This is for debugging (docker run)
100-
if [ -v POSTGRESQL_MASTER_IP ]; then
101-
endpoints=${POSTGRESQL_MASTER_IP:-}
102-
fi
103-
if [ -z "$endpoints" ]; then
104-
>&2 echo "Failed to resolve PostgreSQL master IP address"
105-
exit 3
106-
fi
107-
echo -n "$(echo $endpoints | cut -d ' ' -f 1)"
108-
}
109-
11094
# Converts the version in format x.y or x.y.z to a number.
11195
version2number ()
11296
{
@@ -290,12 +274,11 @@ function set_pgdata ()
290274

291275
function wait_for_postgresql_master() {
292276
while true; do
293-
master_fqdn=$(postgresql_master_addr)
294-
echo "Waiting for PostgreSQL master (${master_fqdn}) to accept connections ..."
277+
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_IP}) to accept connections ..."
295278
if [ -v POSTGRESQL_ADMIN_PASSWORD ]; then
296-
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${master_fqdn}" -c "SELECT 1;" && return 0
279+
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_IP}" -c "SELECT 1;" && return 0
297280
else
298-
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${master_fqdn}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
281+
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${POSTGRESQL_MASTER_IP}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
299282
fi
300283
sleep 1
301284
done

‎15/root/usr/bin/run-postgresql-slave‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ generate_passwd_file
3131
generate_postgresql_config
3232

3333
wait_for_postgresql_master
34-
export MASTER_FQDN=$(postgresql_master_addr)
34+
export MASTER_FQDN=${POSTGRESQL_MASTER_IP}
3535
initialize_replica
3636

3737
unset_env_vars

‎15/root/usr/share/container-scripts/postgresql/common.sh‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@ function unset_env_vars() {
9191
unset POSTGRESQL_{DATABASE,USER,PASSWORD,ADMIN_PASSWORD}
9292
}
9393

94-
# postgresql_master_addr lookups the 'postgresql-master' DNS and get list of the available
95-
# endpoints. Each endpoint is a PostgreSQL container with the 'master' PostgreSQL running.
96-
function postgresql_master_addr() {
97-
local service_name=${POSTGRESQL_MASTER_SERVICE_NAME:-postgresql-master}
98-
local endpoints=$(dig ${service_name} A +search | grep ";${service_name}" | cut -d ';' -f 2 2>/dev/null)
99-
# FIXME: This is for debugging (docker run)
100-
if [ -v POSTGRESQL_MASTER_IP ]; then
101-
endpoints=${POSTGRESQL_MASTER_IP:-}
102-
fi
103-
if [ -z "$endpoints" ]; then
104-
>&2 echo "Failed to resolve PostgreSQL master IP address"
105-
exit 3
106-
fi
107-
echo -n "$(echo $endpoints | cut -d ' ' -f 1)"
108-
}
109-
11094
# Converts the version in format x.y or x.y.z to a number.
11195
version2number ()
11296
{
@@ -290,12 +274,11 @@ function set_pgdata ()
290274

291275
function wait_for_postgresql_master() {
292276
while true; do
293-
master_fqdn=$(postgresql_master_addr)
294-
echo "Waiting for PostgreSQL master (${master_fqdn}) to accept connections ..."
277+
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_IP}) to accept connections ..."
295278
if [ -v POSTGRESQL_ADMIN_PASSWORD ]; then
296-
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${master_fqdn}" -c "SELECT 1;" && return 0
279+
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_IP}" -c "SELECT 1;" && return 0
297280
else
298-
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${master_fqdn}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
281+
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${POSTGRESQL_MASTER_IP}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
299282
fi
300283
sleep 1
301284
done

‎16/root/usr/bin/run-postgresql-slave‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ generate_passwd_file
3131
generate_postgresql_config
3232

3333
wait_for_postgresql_master
34-
export MASTER_FQDN=$(postgresql_master_addr)
34+
export MASTER_FQDN=${POSTGRESQL_MASTER_IP}
3535
initialize_replica
3636

3737
unset_env_vars

‎16/root/usr/share/container-scripts/postgresql/common.sh‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@ function unset_env_vars() {
9191
unset POSTGRESQL_{DATABASE,USER,PASSWORD,ADMIN_PASSWORD}
9292
}
9393

94-
# postgresql_master_addr lookups the 'postgresql-master' DNS and get list of the available
95-
# endpoints. Each endpoint is a PostgreSQL container with the 'master' PostgreSQL running.
96-
function postgresql_master_addr() {
97-
local service_name=${POSTGRESQL_MASTER_SERVICE_NAME:-postgresql-master}
98-
local endpoints=$(dig ${service_name} A +search | grep ";${service_name}" | cut -d ';' -f 2 2>/dev/null)
99-
# FIXME: This is for debugging (docker run)
100-
if [ -v POSTGRESQL_MASTER_IP ]; then
101-
endpoints=${POSTGRESQL_MASTER_IP:-}
102-
fi
103-
if [ -z "$endpoints" ]; then
104-
>&2 echo "Failed to resolve PostgreSQL master IP address"
105-
exit 3
106-
fi
107-
echo -n "$(echo $endpoints | cut -d ' ' -f 1)"
108-
}
109-
11094
# Converts the version in format x.y or x.y.z to a number.
11195
version2number ()
11296
{
@@ -290,12 +274,11 @@ function set_pgdata ()
290274

291275
function wait_for_postgresql_master() {
292276
while true; do
293-
master_fqdn=$(postgresql_master_addr)
294-
echo "Waiting for PostgreSQL master (${master_fqdn}) to accept connections ..."
277+
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_IP}) to accept connections ..."
295278
if [ -v POSTGRESQL_ADMIN_PASSWORD ]; then
296-
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${master_fqdn}" -c "SELECT 1;" && return 0
279+
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_IP}" -c "SELECT 1;" && return 0
297280
else
298-
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${master_fqdn}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
281+
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${POSTGRESQL_MASTER_IP}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
299282
fi
300283
sleep 1
301284
done

‎src/root/usr/bin/run-postgresql-slave‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ generate_passwd_file
3737
generate_postgresql_config
3838

3939
wait_for_postgresql_master
40-
export MASTER_FQDN=$(postgresql_master_addr)
40+
export MASTER_FQDN=${POSTGRESQL_MASTER_IP}
4141
initialize_replica
4242

4343
unset_env_vars

‎src/root/usr/share/container-scripts/postgresql/common.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ function set_pgdata ()
275275

276276
function wait_for_postgresql_master() {
277277
while true; do
278-
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_SERVICE_NAME}) to accept connections ..."
278+
echo "Waiting for PostgreSQL master (${POSTGRESQL_MASTER_IP}) to accept connections ..."
279279
if [ -v POSTGRESQL_ADMIN_PASSWORD ]; then
280-
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_SERVICE_NAME}" -c "SELECT 1;" && return 0
280+
PGPASSWORD=${POSTGRESQL_ADMIN_PASSWORD} psql "postgresql://postgres@${POSTGRESQL_MASTER_IP}" -c "SELECT 1;" && return 0
281281
else
282-
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${master_fqdn}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
282+
PGPASSWORD=${POSTGRESQL_PASSWORD} psql "postgresql://${POSTGRESQL_USER}@${POSTGRESQL_MASTER_IP}/${POSTGRESQL_DATABASE}" -c "SELECT 1;" && return 0
283283
fi
284284
sleep 1
285285
done

0 commit comments

Comments
 (0)