[ovs-git] [ovn-org/ovn] af6308: Revert "ovn-ctl: Handle cluster db upgrades for ru...

numansiddique noreply at github.com
Thu Mar 11 19:10:41 UTC 2021


  Branch: refs/heads/branch-20.06
  Home:   https://github.com/ovn-org/ovn
  Commit: af63089d09f7a2f7bfab219ac84e276239d04467
      https://github.com/ovn-org/ovn/commit/af63089d09f7a2f7bfab219ac84e276239d04467
  Author: Frode Nordahl <frode.nordahl at canonical.com>
  Date:   2021-03-11 (Thu, 11 Mar 2021)

  Changed paths:
    M utilities/ovn-ctl

  Log Message:
  -----------
  Revert "ovn-ctl: Handle cluster db upgrades for run_(nb/sb)_ovsdb"

This reverts commit 3ee3d4ee41c19df7e700d59950ceb8816686c0fd.

Signed-off-by: Frode Nordahl <frode.nordahl at canonical.com>
Signed-off-by: Numan Siddique <numans at ovn.org>


  Commit: 0bb89ee4e5109e229bb8f02c890597fc7b6cd088
      https://github.com/ovn-org/ovn/commit/0bb89ee4e5109e229bb8f02c890597fc7b6cd088
  Author: Numan Siddique <numans at ovn.org>
  Date:   2021-03-11 (Thu, 11 Mar 2021)

  Changed paths:
    M utilities/ovn-ctl

  Log Message:
  -----------
  ovn-ctl: Handle cluster db upgrades for run_(nb/sb)_ovsdb

when ovn-ctl run_(nb_sb)_ovsdb is called, the ovsdb-server is started without
passing --detach and --monoitor and the process is exec'd.

For cluster mode, upgrade_cluster is never called and hence the dbs are not upraded
to new schema. CMS has to handle the db upgrade separately.

This patch handles the db upgrade by starting ovsdb-server in background and then
waits on ovsdb-server to complete.

Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1868392
Acked-by: Mark Michelson <mmichels at redhat.com>
Signed-off-by: Numan Siddique <numans at ovn.org>
(cherry picked from commit 67e2f386cc838d0b0f9b4b5da7fe611e1113b70c)
(adapted to not use `start_wrapped_daemon` which does not exist in branch-20.06)
Signed-off-by: Frode Nordahl <frode.nordahl at canonical.com>


Compare: https://github.com/ovn-org/ovn/compare/c166fdfa44bd...0bb89ee4e510


More information about the git mailing list