Skip to content

Commit

Permalink
fix: leader may change during startup, use cluster connection to set …
Browse files Browse the repository at this point in the history 
…options.
  • Loading branch information
@oilbeater
oilbeater committed Apr 23, 2021
1 parent d503184 commit 2a2cd27
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions dist/images/start-db.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ trap quit EXIT
if [[ "$ENABLE_SSL" == "false" ]]; then
if [[ -z "$NODE_IPS" ]]; then
/usr/share/ovn/scripts/ovn-ctl restart_northd
ovn-nbctl set-connection ptcp:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
ovn-nbctl set Connection . inactivity_probe=180000
ovn-nbctl set NB_Global . options:use_logical_dp_groups=true
ovn-nbctl --no-leader-only set-connection ptcp:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
ovn-nbctl --no-leader-only set Connection . inactivity_probe=180000
ovn-nbctl --no-leader-only set NB_Global . options:use_logical_dp_groups=true

ovn-sbctl set-connection ptcp:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
ovn-sbctl set Connection . inactivity_probe=180000
ovn-sbctl --no-leader-only set-connection ptcp:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
ovn-sbctl --no-leader-only set Connection . inactivity_probe=180000
else
if [[ ! "$NODE_IPS" =~ "$POD_IP" ]]; then
echo "ERROR! host ip $POD_IP not in env NODE_IPS $NODE_IPS"
Expand All @@ -94,12 +94,12 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
--ovn-northd-nb-db="$(gen_conn_str 6641)" \
--ovn-northd-sb-db="$(gen_conn_str 6642)" \
start_northd
ovn-nbctl set-connection ptcp:"${DB_NB_PORT}":[::]
ovn-nbctl set Connection . inactivity_probe=180000
ovn-nbctl set NB_Global . options:use_logical_dp_groups=true
ovn-nbctl --no-leader-only set-connection ptcp:"${DB_NB_PORT}":[::]
ovn-nbctl --no-leader-only set Connection . inactivity_probe=180000
ovn-nbctl --no-leader-only set NB_Global . options:use_logical_dp_groups=true

ovn-sbctl set-connection ptcp:"${DB_SB_PORT}":[::]
ovn-sbctl set Connection . inactivity_probe=180000
ovn-sbctl --no-leader-only set-connection ptcp:"${DB_SB_PORT}":[::]
ovn-sbctl --no-leader-only set Connection . inactivity_probe=180000
else
while ! nc -z "${nb_leader_ip}" "${DB_NB_PORT}" >/dev/null;
do
Expand Down Expand Up @@ -140,12 +140,12 @@ else
--ovn-northd-ssl-cert=/var/run/tls/cert \
--ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
restart_northd
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true

ovn-sbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
ovn-sbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-sbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
ovn-sbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
else
if [[ ! "$NODE_IPS" =~ "$POD_IP" ]]; then
echo "ERROR! host ip $POD_IP not in env NODE_IPS $NODE_IPS"
Expand Down Expand Up @@ -174,12 +174,12 @@ else
--ovn-northd-nb-db="$(gen_conn_str 6641)" \
--ovn-northd-sb-db="$(gen_conn_str 6642)" \
start_northd
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_NB_PORT}":[::]
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-nbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_NB_PORT}":[::]
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true

ovn-sbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_SB_PORT}":[::]
ovn-sbctl -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
ovn-sbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${DB_SB_PORT}":[::]
ovn-sbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=180000
else
while ! nc -z "${nb_leader_ip}" "${DB_NB_PORT}" >/dev/null;
do
Expand Down

0 comments on commit 2a2cd27

Please sign in to comment.