Merge pull request mysql#10 from planetscale/piki/fix-the-unit-tests

Fix the unit tests and generate a working container

Author: piki

Dockerfile.build

@@ -4,7 +4,7 @@ RUN apt-get update && apt-get upgrade -y
 
 ENV DEBIAN_FRONTEND noninteractive
 
-ADD . /src
+ADD --chown=1234 . /src
 WORKDIR /src
 
 RUN apt-get install -y \
@@ -25,4 +25,7 @@ RUN apt-get install -y \
       libnuma-dev \
       libmecab-dev \
       libssl-dev \
+      net-tools \
       git-core
+
+RUN adduser --disabled-password --no-create-home --gecos '' bob --uid 1234

Dockerfile.release

@@ -7,10 +7,20 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get install -y \
       libaio1 \
       libnuma1 \
+      libtcmalloc-minimal4 \
       binutils
 
 ADD dist/ /dist
 
-RUN tar -xzvf /dist/mysql-8.0.28-linux-x86_64.tar.gz -C /usr --strip-components=1 && strip /usr/bin/mysql* || true && rm -rf /dist/*.tar.gz
+RUN tar -xzvf /dist/mysql-8.0.28-linux-x86_64.tar.gz -C /usr --strip-components=1
+RUN strip /usr/bin/mysql* || true
+RUN cd /usr ; chown root.root $(tar tzf /dist/mysql-8.0.28-linux-x86_64.tar.gz | cut -d/ -f2-)
+RUN rm -rf /dist/*.tar.gz
 RUN apt-get remove -y binutils && apt-get autoremove -y
 RUN rm -rf /usr/mysql-test
+
+RUN adduser --disabled-password --no-create-home --gecos '' vitess --uid 999
+RUN mkdir /var/run/mysqld
+RUN chown vitess.vitess /var/run/mysqld
+
+USER vitess

build.sh

@@ -1,8 +1,19 @@
+#!/bin/bash
+
+set -e
+
+if [ $(id -u) -eq 0 ]; then
+	su bob -c ./build.sh
+	cp build/*.tar.gz /dist/
+	exit
+fi
+
 if [ -d build ]; then
   rm -rf build
 fi
 
-mkdir build && cd build
+mkdir build
+cd build
 
 cmake \
   -DBUILD_CONFIG=mysql_release \
@@ -25,8 +36,13 @@ cmake \
   -DWITH_INNODB_MEMCACHED=1 \
   -DWITH_MECAB=system \
   -DWITH_NUMA=ON \
-  .. && \
-make -j $(nproc) && \
-make package -j $(nproc)
+  -DWITH_ROUTER=OFF \
+  ..
+
+make -j $(nproc)
+
+DISABLE_IPV6_TESTS=1 DISABLE_TMPFILE_TESTS=1 make test ARGS="-j $(nproc) -E ^routertest -VV"
+
+strip -g runtime_output_directory/mysql*
 
-cp *.tar.gz /dist/
+make -j $(nproc) package

router/src/harness/tests/test_net_ts_internet.cc

@@ -637,6 +637,11 @@ TEST(NetTS_internet, tcp_ipv4_socket_bind_accept_connect_dynbuffer) {
 }
 
 TEST(NetTS_internet, tcp_ipv6_socket_bind_accept_connect) {
+  if (getenv("DISABLE_IPV6_TESTS")) {
+    // fails when ipv6 is present but disabled
+    GTEST_SKIP();
+  }
+
   net::io_context io_ctx;
 
   net::ip::tcp::endpoint endp = net_ipv6_any_port_endpoint();
@@ -724,6 +729,11 @@ TEST(NetTS_internet, tcp_ipv6_socket_bind_accept_connect) {
 }
 
 TEST(NetTS_internet, udp_ipv6_socket_bind_accept_connect) {
+  if (getenv("DISABLE_IPV6_TESTS")) {
+    // fails when ipv6 is present but disabled
+    GTEST_SKIP();
+  }
+
   net::io_context io_ctx;
 
   // any ip, any port
@@ -881,13 +891,19 @@ class NetTS_internet_async : public ::testing::Test,
 // the receiving side calls net::async_receive() which should read until the
 // end-of-stream.
 TEST_P(NetTS_internet_async, tcp_client_send_close) {
-  net::io_context io_ctx;
 
   using protocol_type = net::ip::tcp;
 
   // localhost, any port
   protocol_type::endpoint endp = std::get<1>(GetParam());
 
+  if (getenv("DISABLE_IPV6_TESTS") && endp == net_ipv6_any_port_endpoint()) {
+    // fails when ipv6 is present but disabled
+    GTEST_SKIP();
+  }
+
+  net::io_context io_ctx;
+
   protocol_type::acceptor acceptor(io_ctx);
   EXPECT_THAT(acceptor.open(endp.protocol()), ::testing::Truly(res_has_value));
   auto bind_res = acceptor.bind(endp);
@@ -989,6 +1005,11 @@ TEST_P(NetTS_internet_async, tcp_accept_with_endpoint) {
   // localhost, any port
   protocol_type::endpoint endp = std::get<1>(GetParam());
 
+  if (getenv("DISABLE_IPV6_TESTS") && endp == net_ipv6_any_port_endpoint()) {
+    // fails when ipv6 is present but disabled
+    GTEST_SKIP();
+  }
+
   protocol_type::acceptor acceptor(io_ctx);
   EXPECT_THAT(acceptor.open(endp.protocol()), ::testing::Truly(res_has_value));
   auto bind_res = acceptor.bind(endp);

router/tests/component/test_http_server.cc

@@ -71,6 +71,9 @@ static_assert(sizeof(kInvalidBindAddress) > 7 + 1,
               "kInvalidBindAddress is too short");
 #endif
 
+const std::string localhost_ipv4("127.0.0.1");
+const std::string localhost_ipv6("::1");
+
 using namespace std::chrono_literals;
 
 const std::string kHttpBasedir(kPlaceholderHttpBaseDir);
@@ -213,6 +216,11 @@ TempDirectory HttpServerPlainTest::http_base_dir_;
  * - make a client connect to the http-server
  */
 TEST_P(HttpServerPlainTest, ensure) {
+  if (getenv("DISABLE_IPV6_TESTS") && GetParam().http_hostname == localhost_ipv6) {
+    // fails when ipv6 is present but disabled
+    GTEST_SKIP();
+  }
+
   std::vector<std::pair<std::string, std::string>> http_section;
   http_section.reserve(GetParam().http_section.size());
 
@@ -313,9 +321,6 @@ TEST_P(HttpServerPlainTest, ensure) {
   }
 }
 
-const std::string localhost_ipv4("127.0.0.1");
-const std::string localhost_ipv6("::1");
-
 static const HttpServerPlainParams http_server_static_files_params[]{
     {"bind-address-ipv4-any",
      "WL11891::TS-3",

unittest/gunit/mysys_pathfuncs-t.cc

@@ -142,6 +142,12 @@ TEST(Mysys, LoadPathOverflow) {
 
 #ifdef HAVE_O_TMPFILE
 TEST(Mysys, CreateTempFile) {
+  if (getenv("DISABLE_TMPFILE_TESTS")) {
+    // In Docker, /tmp is a plain subdirectory under /, which is an overlayfs
+    // O_TMPFILE does not work on overlayfs
+    GTEST_SKIP();
+  }
+
   char dst[FN_REFLEN];
   aset(dst, 0xaa);