[ovs-git] [ovn-org/ovn] 58e5d3: ovn-controller: Fix nb_cfg update with monitor_con...

[Dumitru Ceara]

  Branch: refs/heads/master
  Home:   https://github.com/ovn-org/ovn
  Commit: 58e5d32b011b1175643578e70e5aa29b56e256c0
      https://github.com/ovn-org/ovn/commit/58e5d32b011b1175643578e70e5aa29b56e256c0
  Author: Dumitru Ceara <dceara at redhat.com>
  Date:   2020-12-03 (Thu, 03 Dec 2020)

  Changed paths:
    M controller/ovn-controller.c

  Log Message:
  -----------
  ovn-controller: Fix nb_cfg update with monitor_cond_change in flight.

It is not correct for ovn-controller to pass the current SB_Global.nb_cfg
value to ofctrl_put() if there are pending changes to conditional
monitoring clauses (local or in flight).  It might be that after the
monitor condition is acked by the SB, records that were added to the SB
before SB_Global.nb_cfg was set are now sent as updates to
ovn-controller.  These should be first installed in OVS before
ovn-controller reports that it caught up with the current
SB_Global.nb_cfg value.

Also:
- ofctrl_put should be called after SB monitor conditions are updated.

Acked-by: Ben Pfaff <blp at ovn.org>
Signed-off-by: Dumitru Ceara <dceara at redhat.com>
Signed-off-by: Han Zhou <hzhou at ovn.org>


  Commit: 66417bf119c60fd0f1b4ac620439395402d7e28b
      https://github.com/ovn-org/ovn/commit/66417bf119c60fd0f1b4ac620439395402d7e28b
  Author: Dumitru Ceara <dceara at redhat.com>
  Date:   2020-12-03 (Thu, 03 Dec 2020)

  Changed paths:
    M controller/ofctrl.c

  Log Message:
  -----------
  ofctrl: Wait for OVS updates to be processed before updating cur_cfg.

Fixes: ca278d98a4f5 ("ovn-controller: Initial use of incremental engine - quiet mode.")
Signed-off-by: Dumitru Ceara <dceara at redhat.com>
Signed-off-by: Han Zhou <hzhou at ovn.org>


Compare: https://github.com/ovn-org/ovn/compare/adff089b7347...66417bf119c6