Skip vos tests when vlserver can't start

Pull in the upstream patch for this, to try to prevent the intermittent
test failures on buildds that cause annoying FTBFS bugs.

Change-Id: Ibb57f8cd6ded7438b6756049ee48760fdc955dbc

diff --git a/debian/changelog b/debian/changelog
index 5ce5d3fcf61fab1b0f7099cc320e75ce7e5e9d68..7f920e287e791ad58d83148373aa4e289a32316b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ openafs (1.8.6~pre1-1) UNRELEASED; urgency=medium
   * Pull in additional patches from upstream:
     - Support linux kernel 5.6 release
     - Recognize ppc64le in configure's OS-detection logic
+    - Skip vos tests if vlserver port is already bound (Closes: 953729)
   * Fix typo preventing ppc64el support from working (Closes: #946520)
   * Update Italian debconf translation; thanks Beatrice Torracca
     (Closes: #952799)

diff --git a/debian/patches/0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch b/debian/patches/0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
new file mode 100644 (file)
index 0000000..6350671
--- /dev/null
+++ b/debian/patches/0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
@@ -0,0 +1,94 @@
+From: Michael Meffie <mmeffie@sinenomine.net>
+Date: Fri, 10 Jan 2020 10:54:20 -0500
+Subject: tests: skip vos tests when a vlserver is already running
+
+The vos tests start a temporary vlserver process, which is problematic
+when the local system already has an installed vlserver. Attempt to
+temporarily bind a socket to the vlserver port, and if unable to bind
+with an EADDRINUSE error, assume the vlserver is already running and
+skip these tests.
+
+Change-Id: I1dd3bc4c7ebcd2c7bffc8aca422222a50058090e
+Reviewed-on: https://gerrit.openafs.org/14021
+Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
+Reviewed-by: Andrew Deason <adeason@sinenomine.net>
+Tested-by: BuildBot <buildbot@rampaginggeek.com>
+Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
+(cherry picked from commit bf1b3e2fc12a7502cfd74eb109eeb7131f7230d3)
+---
+ tests/common/common.h  |  1 +
+ tests/common/network.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ tests/volser/vos-t.c   |  2 ++
+ 3 files changed, 44 insertions(+)
+
+diff --git a/tests/common/common.h b/tests/common/common.h
+index c9f7349..5491fd4 100644
+--- a/tests/common/common.h
++++ b/tests/common/common.h
+@@ -55,3 +55,4 @@ extern int afstest_GetUbikClient(struct afsconf_dir *dir, char *service,
+ extern int afstest_IsLoopbackNetworkDefault(void);
+ extern int afstest_SkipTestsIfLoopbackNetIsDefault(void);
+ extern void afstest_SkipTestsIfBadHostname(void);
++extern void afstest_SkipTestsIfServerRunning(char *name);
+diff --git a/tests/common/network.c b/tests/common/network.c
+index 474fc61..c664505 100644
+--- a/tests/common/network.c
++++ b/tests/common/network.c
+@@ -61,3 +61,44 @@ afstest_SkipTestsIfBadHostname(void)
+     if (!host)
+       skip_all("Can't resolve hostname %s\n", hostname);
+ }
++
++/*!
++ * Skips all TAP tests if a server is already running on this system.
++ *
++ * \param name[in]  IANA service name, e.g. "afs3-vlserver"
++ */
++void
++afstest_SkipTestsIfServerRunning(char *name)
++{
++    afs_int32 code;
++    osi_socket sock;
++    struct sockaddr_in addr;
++    afs_int32 service;
++
++    service = afsconf_FindService(name);
++    if (service == -1) {
++      fprintf(stderr, "Unknown service name: %s\n", name);
++      exit(1);
++    }
++    sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
++    if (sock == OSI_NULLSOCKET) {
++      fprintf(stderr, "Failed to get socket file descriptor.\n");
++      exit(1);
++    }
++    addr.sin_family = AF_INET;
++    addr.sin_addr.s_addr = htonl(INADDR_ANY);
++    addr.sin_port = service; /* Already in network byte order. */
++#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
++    addr.sin_len = sizeof(addr);
++#endif
++    code = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
++    if (code < 0) {
++      if (errno == EADDRINUSE) {
++          skip_all("Service %s is already running.\n", name);
++      } else {
++          perror("bind");
++          exit(1);
++      }
++    }
++    close(sock);
++}
+diff --git a/tests/volser/vos-t.c b/tests/volser/vos-t.c
+index 57161f4..1ec75a1 100644
+--- a/tests/volser/vos-t.c
++++ b/tests/volser/vos-t.c
+@@ -105,6 +105,8 @@ main(int argc, char **argv)
+     afstest_SkipTestsIfBadHostname();
+     /* Skip all tests if the current hostname is on the loopback network */
+     afstest_SkipTestsIfLoopbackNetIsDefault();
++    /* Skip all tests if a vlserver is already running on this system. */
++    afstest_SkipTestsIfServerRunning("afs3-vlserver");
+ 
+     plan(6);
+ 

diff --git a/debian/patches/series b/debian/patches/series
index ad36659519b269918095a3178321d9b7b4048f52..6a928764f2e9f1c10386196d5d5eecbf6b074f03 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-afs-Add-ppc64le-changes-in-osconf.m4-file.patch
 0003-LINUX-Avoid-building-rand-fortuna-kernel.o.patch
 0004-LINUX-5.6-define-time_t-and-use-timespec-timespec64.patch
+0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch