Thanks for the fix, Numan.
Acked-by: Mark Michelson <[email protected]>
On 6/11/20 3:23 AM, [email protected] wrote:
From: Numan Siddique <[email protected]>
The below error is seen.
../controller/ovn-controller.c:2305:70: error: Using plain integer as NULL
pointer
make[1]: *** [Makefile:2000: controller/ovn-controller.o] Error 1
make[1]: *** Waiting for unfinished jobs....
Fixes: 512b884dea3f("Add northd and ovn-controller cluster status reset
commands.")
CC: Mark Michelson <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>
---
controller/ovn-controller.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index 53b3a94ca..bf7214e45 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -476,7 +476,7 @@ update_sb_db(struct ovsdb_idl *ovs_idl, struct ovsdb_idl
*ovnsb_idl,
if (monitor_all_p) {
*monitor_all_p = monitor_all;
}
- if (*reset_ovnsb_idl_min_index) {
+ if (reset_ovnsb_idl_min_index && *reset_ovnsb_idl_min_index) {
VLOG_INFO("Resetting southbound database cluster state");
engine_set_force_recompute(true);
ovsdb_idl_reset_min_index(ovnsb_idl);
@@ -2302,7 +2302,7 @@ main(int argc, char *argv[])
if (!restart) {
bool done = !ovsdb_idl_has_ever_connected(ovnsb_idl_loop.idl);
while (!done) {
- update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, false);
+ update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, NULL);
update_ssl_config(ovsrec_ssl_table_get(ovs_idl_loop.idl));
struct ovsdb_idl_txn *ovs_idl_txn
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
