[ovs-dev] [PATCH ovn v3 6/6] ovn-northd-ddlog: New implementation of ovn-northd based on ddlog.

Ben Pfaff blp at ovn.org
Tue Nov 10 00:41:08 UTC 2020


On Mon, Nov 09, 2020 at 05:26:04PM -0500, Flavio Fernandes wrote:
> Not sure if you see an issue I'm seeing when building with "-j" but I thought of mentioning it here in case you do not.
> 
> When building on a centos 8 system I seem to hit a race regarding ddlog.h
> 
> 	GEN tests/system-userspace-testsuite
> 	northd/ovn-northd-ddlog.c:45:10: fatal error: northd/ovn_northd_ddlog/ddlog.h: No such file or directory
> 	#include "northd/ovn_northd_ddlog/ddlog.h"
> 	^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Oops, sorry.  I'll fold in the following fix.  The first hunk keeps
northd/ovn_northd_ddlog/ddlog.h from getting distributed by "make dist"
(it should not be), and the second one fixes the dependency problem.

diff --git a/northd/automake.mk b/northd/automake.mk
index 2717f59c5f3a..157b5d0df487 100644
--- a/northd/automake.mk
+++ b/northd/automake.mk
@@ -22,8 +22,7 @@ bin_PROGRAMS += northd/ovn-northd-ddlog
 northd_ovn_northd_ddlog_SOURCES = \
 	northd/ovn-northd-ddlog.c \
 	northd/ovn-northd-ddlog-sb.inc \
-	northd/ovn-northd-ddlog-nb.inc \
-	northd/ovn_northd_ddlog/ddlog.h
+	northd/ovn-northd-ddlog-nb.inc
 northd_ovn_northd_ddlog_LDADD = \
 	northd/ovn_northd_ddlog/target/release/libovn_northd_ddlog.la \
 	lib/libovn.la \
@@ -46,6 +45,7 @@ BUILT_SOURCES += \
 	northd/ovn-northd-ddlog-sb.inc \
 	northd/ovn-northd-ddlog-nb.inc
 
+northd/ovn-northd-ddlog.$(OBJEXT): northd/ovn_northd_ddlog/ddlog.h
 northd/ovn_northd_ddlog/ddlog.h: northd/ddlog.stamp
 
 CARGO_VERBOSE = $(cargo_verbose_$(V))

> Also, I have a silly typo nit inline:
> 
> Documentation/topics/debugging-ddlog.rst <https://github.com/blp/ovs-reviews/commit/bb4aa21b5f7fe32f2ec1540a3b335b5ad14de9b8#diff-f061bd3e960efc17adfda84c8b76d88ff7705ef077a45622e4f15fd78499b7b3>
> Nit typo: conrete (line 29) -- meant to say "concrete"?

Thanks, I've folded that in, too.


More information about the dev mailing list