diff --git a/charts/kube-ovn/templates/central-deploy.yaml b/charts/kube-ovn/templates/central-deploy.yaml index aadd1477deb..0f4044b49af 100644 --- a/charts/kube-ovn/templates/central-deploy.yaml +++ b/charts/kube-ovn/templates/central-deploy.yaml @@ -74,6 +74,8 @@ spec: value: "{{- .Values.func.ENABLE_BIND_LOCAL_IP }}" - name: PROBE_INTERVAL value: "{{ .Values.networking.PROBE_INTERVAL }}" + - name: OVN_NORTHD_PROBE_INTERVAL + value: "{{ .Values.networking.OVN_NORTHD_PROBE_INTERVAL}}" - name: OVN_LEADER_PROBE_INTERVAL value: "{{ .Values.networking.OVN_LEADER_PROBE_INTERVAL }}" - name: OVN_NORTHD_N_THREADS diff --git a/charts/kube-ovn/values.yaml b/charts/kube-ovn/values.yaml index 891ec6c264a..e65c8a85a84 100644 --- a/charts/kube-ovn/values.yaml +++ b/charts/kube-ovn/values.yaml @@ -47,6 +47,7 @@ networking: ENABLE_METRICS: true NODE_LOCAL_DNS_IP: "" PROBE_INTERVAL: 180000 + OVN_NORTHD_PROBE_INTERVAL: 5000 OVN_LEADER_PROBE_INTERVAL: 5 OVN_REMOTE_PROBE_INTERVAL: 10000 OVN_REMOTE_OPENFLOW_INTERVAL: 180 diff --git a/dist/images/install.sh b/dist/images/install.sh index f475f6c7b90..7b3fc7cb323 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -3302,6 +3302,8 @@ spec: value: "$DEBUG_WRAPPER" - name: PROBE_INTERVAL value: "180000" + - name: OVN_NORTHD_PROBE_INTERVAL + value: "5000" - name: OVN_LEADER_PROBE_INTERVAL value: "5" - name: OVN_NORTHD_N_THREADS diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh index 91cfd91d2f6..d4c605e23b4 100755 --- a/dist/images/start-db.sh +++ b/dist/images/start-db.sh @@ -5,6 +5,7 @@ DEBUG_WRAPPER=${DEBUG_WRAPPER:-} ENABLE_COMPACT=${ENABLE_COMPACT:-false} PROBE_INTERVAL=${PROBE_INTERVAL:-180000} OVN_NORTHD_N_THREADS=${OVN_NORTHD_N_THREADS:-1} +OVN_NORTHD_PROBE_INTERVAL=${OVN_NORTHD_PROBE_INTERVAL:-5000} OVN_VERSION_COMPATIBILITY=${OVN_VERSION_COMPATIBILITY:-} DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER --ovsdb-sb-wrapper=$DEBUG_WRAPPER" @@ -249,7 +250,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then /usr/share/ovn/scripts/ovn-ctl restart_northd ovn-nbctl --no-leader-only set-connection ptcp:"${NB_PORT}":["${DB_ADDR}"] ovn-nbctl --no-leader-only set Connection . inactivity_probe=${PROBE_INTERVAL} - ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL} + ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${OVN_NORTHD_PROBE_INTERVAL} ovn-nbctl --no-leader-only set NB_Global . options:use_logical_dp_groups=true ovn-sbctl --no-leader-only set-connection ptcp:"${SB_PORT}":["${DB_ADDR}"] @@ -300,7 +301,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then --ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL} ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL} - ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL} + ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${OVN_NORTHD_PROBE_INTERVAL} ovn-nbctl --no-leader-only set NB_Global . options:use_logical_dp_groups=true else # known leader always first @@ -439,7 +440,7 @@ else /etc/ovn/ovnsb_local_config.db /usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \ --ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd - ovn-nbctl --no-leader-only $SSL_OPTIONS set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL} + ovn-nbctl --no-leader-only $SSL_OPTIONS set NB_Global . options:northd_probe_interval=${OVN_NORTHD_PROBE_INTERVAL} ovn-nbctl --no-leader-only $SSL_OPTIONS set NB_Global . options:use_logical_dp_groups=true else # get leader if cluster exists