From ecdd843f48c17a7b5372c71125a973b24bb2d6ba Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 07 2022 23:46:28 +0000
Subject: Import openvswitch2.13-2.13.0-204 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 4f61be4..db901e8 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -114791,7 +114791,7 @@ index 3e227d9e3b..ebd9ac9be5 100644
  
  #endif /* CT_DPIF_H */
 diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c
-index 7e48630f0e..4e2874c22e 100644
+index 7e48630f0e..b9964fa182 100644
 --- a/lib/daemon-unix.c
 +++ b/lib/daemon-unix.c
 @@ -285,6 +285,7 @@ fork_and_wait_for_startup(int *fdp, pid_t *child_pid)
@@ -114802,6 +114802,15 @@ index 7e48630f0e..4e2874c22e 100644
                  }
              } else if (retval < 0) {
                  VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno));
+@@ -392,6 +393,8 @@ monitor_daemon(pid_t daemon_pid)
+                 }
+ 
+                 log_received_backtrace(daemonize_fd);
++                close(daemonize_fd);
++                daemonize_fd = -1;
+ 
+                 /* Throttle restarts to no more than once every 10 seconds. */
+                 if (time(NULL) < last_restart + 10) {
 diff --git a/lib/dns-resolve.c b/lib/dns-resolve.c
 index 1ff58960fe..6a6b24d981 100644
 --- a/lib/dns-resolve.c
@@ -130495,6 +130504,18 @@ index 4af44200e8..68ce2c5442 100644
 +    stream_close(stream);
      return (error || !stream) ? 1 : 0;
  }
+diff --git a/tests/test-vconn.c b/tests/test-vconn.c
+index fc8ce4a2c0..96c89bd4e6 100644
+--- a/tests/test-vconn.c
++++ b/tests/test-vconn.c
+@@ -157,6 +157,7 @@ test_refuse_connection(struct ovs_cmdl_context *ctx)
+     error = vconn_connect_block(vconn, (TIMEOUT - 2) * 1000);
+     if (!strcmp(type, "tcp")) {
+         if (error != ECONNRESET && error != EPIPE && error != ETIMEDOUT
++            && error != ECONNREFUSED
+ #ifdef _WIN32
+             && error != WSAECONNRESET
+ #endif
 diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at
 index 59723e63b8..c7665a1aeb 100644
 --- a/tests/tunnel-push-pop-ipv6.at
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 10674a6..ffdcfac 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 203%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 204%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,13 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 07 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-204
+- Merging upstream branch-2.13 [RH git: b605fab465]
+    Commit list:
+    b0154891fa daemon-unix: Fix file descriptor leak when monitor restarts child.
+    4c26aab8df vconn: Allow ECONNREFUSED in refuse connection test.
+
+
 * Tue Oct 04 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-203
 - Merging upstream branch-2.13 [RH git: ae3d594a45]
     Commit list: