Support compilation on ubuntu-resolute stemcells

jobs/galera-agent/templates/service.bash

@@ -27,6 +27,6 @@ fi
 mount --make-rslave /sys/fs/cgroup
 umount --recursive /sys/fs/cgroup
 umount /var/vcap/bosh/etc
-exec chpst -u vcap -- /var/vcap/packages/galera-agent/bin/galera-agent \
+exec runuser -u vcap -g vcap -- /var/vcap/packages/galera-agent/bin/galera-agent \
   --configPath=/var/vcap/jobs/galera-agent/config/galera-agent-config.yml \
   --timeFormat="<%= p('logging.format.timestamp') %>"

packages/percona-xtrabackup-8.0/packaging

@@ -3,6 +3,13 @@
 set -o errexit
 set -o nounset
 
+# Workaround for uutils coreutils 0.7.0 (ubuntu-resolute): its `install -D`
+# replaces symlink path components with real directories instead of following
+# them. Resolve the real path so libaio's `make install` (which uses
+# `install -D`) writes to the correct location on persistent disk.
+# See https://github.com/uutils/coreutils/issues/11469
+BOSH_INSTALL_TARGET=$(readlink -f "${BOSH_INSTALL_TARGET}")
+
 main() {
   install_build_dependencies
   unpack_source

packages/percona-xtrabackup-8.4/packaging

@@ -3,6 +3,13 @@
 set -o errexit
 set -o nounset
 
+# Workaround for uutils coreutils 0.7.0 (ubuntu-resolute): its `install -D`
+# replaces symlink path components with real directories instead of following
+# them. Resolve the real path so libaio's `make install` (which uses
+# `install -D`) writes to the correct location on persistent disk.
+# See https://github.com/uutils/coreutils/issues/11469
+BOSH_INSTALL_TARGET=$(readlink -f "${BOSH_INSTALL_TARGET}")
+
 main() {
   install_build_dependencies
   unpack_source

packages/percona-xtradb-cluster-8.0/packaging

@@ -4,6 +4,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# Workaround for uutils coreutils 0.7.0 (ubuntu-resolute): its `install -D`
+# replaces symlink path components with real directories instead of following
+# them. Resolve the real path so libaio's `make install` (which uses
+# `install -D`) writes to the correct location on persistent disk.
+# See https://github.com/uutils/coreutils/issues/11469
+BOSH_INSTALL_TARGET=$(readlink -f "${BOSH_INSTALL_TARGET}")
+
 main() {
   install_build_dependencies
   install_runtime_dependencies
@@ -29,7 +36,9 @@ install_build_dependencies() {
   tar -xf boost_*.tar.bz2
   cd boost_*/
   ./bootstrap.sh --with-libraries=program_options,system
-  ./b2 -j "$(nproc)" link=static
+  ./b2 -j "$(nproc)" cxxstd=17 cxxflags="-fPIC" cflags="-fPIC"
+  mkdir -p "${BOSH_INSTALL_TARGET}/lib/private"
+  cp --preserve=all ./stage/lib/libboost_program_options.so.* "${BOSH_INSTALL_TARGET}/lib/private/"
   cd -
 
   tar -xf check_*.tar.gz
@@ -81,7 +90,9 @@ build() {
     cmake .. \
       -DBUILD_CONFIG=mysql_release \
       -DBOOST_ROOT="${boost_dir}" \
+      -DBoost_DIR="$(readlink -f "${boost_dir}"/stage/lib/cmake/Boost-*/)" \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_C_FLAGS="-std=gnu17" \
       -DMINIMAL_RELWITHDEBINFO=OFF \
       -DCMAKE_CXX_COMPILER=g++ \
       -DCMAKE_C_COMPILER=gcc \
@@ -101,7 +112,7 @@ build() {
       -DWITH_AUTHENTICATION_KERBEROS=OFF \
       -DWITH_PERCONA_AUTHENTICATION_LDAP=OFF \
       -DWITH_BOOST="${boost_dir}" \
-      -DWITH_ICU=system \
+      -DWITH_ICU=bundled \
       -DWITH_READLINE=system \
       -DWITH_ROUTER=OFF \
       -DWITH_GROUP_REPLICATION=OFF \

packages/percona-xtradb-cluster-8.4/packaging

@@ -4,6 +4,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# Workaround for uutils coreutils 0.7.0 (ubuntu-resolute): its `install -D`
+# replaces symlink path components with real directories instead of following
+# them. Resolve the real path so libaio's `make install` (which uses
+# `install -D`) writes to the correct location on persistent disk.
+# See https://github.com/uutils/coreutils/issues/11469
+BOSH_INSTALL_TARGET=$(readlink -f "${BOSH_INSTALL_TARGET}")
+
 main() {
   install_build_dependencies
   install_runtime_dependencies
@@ -29,7 +36,9 @@ install_build_dependencies() {
   tar -xf boost_*.tar.bz2
   cd boost_*/
   ./bootstrap.sh --with-libraries=program_options,system
-  ./b2 -j "$(nproc)" link=static
+  ./b2 -j "$(nproc)" cxxstd=17 cxxflags="-fPIC" cflags="-fPIC"
+  mkdir -p "${BOSH_INSTALL_TARGET}/lib/private"
+  cp --preserve=all ./stage/lib/libboost_program_options.so.* "${BOSH_INSTALL_TARGET}/lib/private/"
   cd -
 
   tar -xf check_*.tar.gz
@@ -81,7 +90,9 @@ build() {
     cmake .. \
       -DBUILD_CONFIG=mysql_release \
       -DBOOST_ROOT="${boost_dir}" \
+      -DBoost_DIR="$(readlink -f "${boost_dir}"/stage/lib/cmake/Boost-*/)" \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_C_FLAGS="-std=gnu17" \
       -DMINIMAL_RELWITHDEBINFO=OFF \
       -DCMAKE_CXX_COMPILER=g++ \
       -DCMAKE_C_COMPILER=gcc \
@@ -100,7 +111,8 @@ build() {
       -DWITH_AUTHENTICATION_FIDO=OFF \
       -DWITH_AUTHENTICATION_KERBEROS=OFF \
       -DWITH_PERCONA_AUTHENTICATION_LDAP=OFF \
-      -DWITH_ICU=system \
+      -DWITH_BOOST="${boost_dir}" \
+      -DWITH_ICU=bundled \
       -DWITH_READLINE=system \
       -DWITH_ROUTER=OFF \
       -DWITH_GROUP_REPLICATION=OFF \

src/e2e-tests/singlenode_test.go

@@ -67,8 +67,7 @@ var _ = Describe(fmt.Sprintf("Single Node for PXC version %s", expectedMysqlVers
 		Expect(queryResultString).ToNot(BeEmpty())
 	})
 	It("does not go through crash recovery", func() {
-		output, err := bosh.RemoteCommand(deploymentName, "mysql/0", "stat /var/vcap/sys/log/pxc-mysql/pxc-57-recovery.log")
-		Expect(output).To(ContainSubstring(`stat: cannot statx '/var/vcap/sys/log/pxc-mysql/pxc-57-recovery.log': No such file or directory`))
+		_, err := bosh.RemoteCommand(deploymentName, "mysql/0", "test -e /var/vcap/sys/log/pxc-mysql/pxc-57-recovery.log")
 		Expect(err).To(HaveOccurred())
 	})
 

src/e2e-tests/verification_test.go

@@ -56,7 +56,6 @@ var _ = Describe("Feature Verification", Ordered, Label("verification"), func()
 			bosh.Operation(`test/use-mtls.yml`),
 			bosh.Operation(`test/tune-mysql-config.yml`),
 			bosh.Operation(`test/with-wildcard-schema-access.yml`),
-			bosh.Operation(`test/with-syslog.yml`),
 			bosh.Operation(`test/optimize-vm-swappiness.yml`),
 			bosh.Operation(`enable-jemalloc.yml`),
 			bosh.Operation(`iaas/cluster.yml`),
@@ -654,20 +653,7 @@ var _ = Describe("Feature Verification", Ordered, Label("verification"), func()
 			Expect(contents).To(ContainSubstring("No InnoDB statistics available for this query"))
 			Expect(contents).To(ContainSubstring("DO sleep(10);"))
 		})
-		It("syslog does not forward slow queries", func() {
-			// execute a slow query
-			Expect(db.Exec(`DO sleep(10)`)).Error().NotTo(HaveOccurred())
-			// fetch forwarded logs
-			output, err := bosh.RemoteCommand(deploymentName, "syslog_storer", "cat /var/vcap/store/syslog_storer/syslog.log | grep '47450'")
-			Expect(err).NotTo(HaveOccurred())
 
-			// assert the forwarded logs do not contain any slow queries
-			Expect(output).To(Not(ContainSubstring("Tmp_tables: 0  Tmp_disk_tables: 0  Tmp_table_sizes: 0")))
-			Expect(output).To(Not(ContainSubstring("Full_scan: No  Full_join: No  Tmp_table: No  Tmp_table_on_disk: No")))
-			Expect(output).To(Not(ContainSubstring("Filesort: No  Filesort_on_disk: No  Merge_passes: 0")))
-			Expect(output).To(Not(ContainSubstring("No InnoDB statistics available for this query")))
-			Expect(output).To(Not(ContainSubstring("DO sleep(10);")))
-		})
 		It("rotates the slow query log", func() {
 			By("allocating 51 MiB to the mysql_slow_query log")
 			_, err := bosh.RemoteCommand(deploymentName, "mysql/0", "sudo fallocate -l 51MiB /var/vcap/sys/log/pxc-mysql/mysql_slow_query")