[ovs-dev] [PATCH ovn branch-20.06 v2 1/2] Revert "ovn-ctl: Handle cluster db upgrades for run_(nb/sb)_ovsdb"
Frode Nordahl
frode.nordahl at canonical.com
Thu Mar 11 15:49:25 UTC 2021
This reverts commit 3ee3d4ee41c19df7e700d59950ceb8816686c0fd.
Signed-off-by: Frode Nordahl <frode.nordahl at canonical.com>
---
utilities/ovn-ctl | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/utilities/ovn-ctl b/utilities/ovn-ctl
index ad8e6bb04..8afe68a0a 100755
--- a/utilities/ovn-ctl
+++ b/utilities/ovn-ctl
@@ -288,21 +288,7 @@ $cluster_remote_port
set "$@" --sync-from=`cat $active_conf_file`
fi
- local run_ovsdb_in_bg="no"
- local process_id=
- if test X$detach = Xno && test $mode = cluster && test -z "$cluster_remote_addr" ; then
- # When detach is no (for run_nb_ovsdb/run_sb_ovsdb commands)
- # we want to run ovsdb-server in background rather than running it in
- # foreground so that the OVN dbs are upgraded for the cluster mode.
- # Otherwise, CMS has to take the responsibility of upgrading the dbs.
- # Note: We run only the ovsdb-server in backgroud which created the
- # cluster (i.e cluster_remote_addr is not set.).
- run_ovsdb_in_bg="yes"
- "$@" $file &
- process_id=$!
- else
- start_wrapped_daemon "$wrapper" ovsdb-$db "" "$@" "$file"
- fi
+ "$@" "$file"
# Initialize the database if it's NOT joining a cluster.
if test -z "$cluster_remote_addr"; then
@@ -312,10 +298,6 @@ $cluster_remote_port
if test $mode = cluster; then
upgrade_cluster "$schema" "unix:$sock"
fi
-
- if test $run_ovsdb_in_bg = yes; then
- wait $process_id
- fi
}
start_nb_ovsdb() {
--
2.30.2
More information about the dev
mailing list