feat: Add NUMA support

* Add mount point for coredumps
leil-io · Sep 17, 2024 · c42cc73 · c42cc73
1 parent fab6923
commit c42cc73
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -13,7 +13,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     apt-get install --yes \
         lcov \
         tini build-essential libblkid-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libcrcutil-dev libdb-dev libfmt-dev libfuse3-dev libgoogle-perftools-dev libgtest-dev libisal-dev libjudy-dev libpam0g-dev libspdlog-dev libsystemd-dev libthrift-dev libtirpc-dev liburcu-dev libyaml-cpp-dev netcat-openbsd python3-venv uuid-dev zlib1g-dev docbook docbook-xml krb5-user libacl1-dev libcap-dev libcephfs-dev libdbus-1-dev libglusterfs-dev libgssapi-krb5-2 libjemalloc-dev libkrb5-dev libkrb5support0 libnfsidmap-dev libradospp-dev libradosstriper-dev librgw-dev libsqlite3-dev xfslibs-dev \
-        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree 
+        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree
 
 WORKDIR /saunafs
 COPY ./tests/setup_machine.sh ./tests/
@@ -26,7 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     ./tests/setup_machine.sh setup /mnt/hdd_0 /mnt/hdd_1 /mnt/hdd_2 /mnt/hdd_3 /mnt/hdd_4 /mnt/hdd_5 /mnt/hdd_6 /mnt/hdd_7 || true
 
 RUN mkdir -p /mnt/hdd_0/ /mnt/hdd_1/ /mnt/hdd_2/ /mnt/hdd_3/ /mnt/hdd_4/ /mnt/hdd_5/ /mnt/hdd_6/ /mnt/hdd_7/
-RUN chown saunafstest:saunafstest -R /mnt/hdd_* 
+RUN chown saunafstest:saunafstest -R /mnt/hdd_*
 
 ### Build Phase
 FROM test-setup AS test-build

diff --git a/Dockerfile.pro.test b/Dockerfile.pro.test
@@ -13,8 +13,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     apt-get install --yes \
         lcov \
         tini build-essential libblkid-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libcrcutil-dev libdb-dev libfmt-dev libfuse3-dev libgoogle-perftools-dev libgtest-dev libisal-dev libjudy-dev libpam0g-dev libspdlog-dev libsystemd-dev libthrift-dev libtirpc-dev liburcu-dev libyaml-cpp-dev netcat-openbsd python3-venv uuid-dev zlib1g-dev docbook docbook-xml krb5-user libacl1-dev libcap-dev libcephfs-dev libdbus-1-dev libglusterfs-dev libgssapi-krb5-2 libjemalloc-dev libkrb5-dev libkrb5support0 libnfsidmap-dev libradospp-dev libradosstriper-dev librgw-dev libsqlite3-dev xfslibs-dev \
-        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree 
-
+        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree zonefs-tools
 
 WORKDIR /saunafs
 COPY ./saunafs/tests/setup_machine.sh ./tests/
@@ -27,7 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     ./tests/setup_machine.sh setup /mnt/hdd_0 /mnt/hdd_1 /mnt/hdd_2 /mnt/hdd_3 /mnt/hdd_4 /mnt/hdd_5 /mnt/hdd_6 /mnt/hdd_7 || true
 
 RUN mkdir -p /mnt/hdd_0/ /mnt/hdd_1/ /mnt/hdd_2/ /mnt/hdd_3/ /mnt/hdd_4/ /mnt/hdd_5/ /mnt/hdd_6/ /mnt/hdd_7/
-RUN chown saunafstest:saunafstest -R /mnt/hdd_* 
+RUN chown saunafstest:saunafstest -R /mnt/hdd_*
 
 ### Build Phase
 FROM test-setup AS test-build

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -13,7 +13,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     apt-get install --yes \
         lcov \
         tini build-essential libblkid-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libcrcutil-dev libdb-dev libfmt-dev libfuse3-dev libgoogle-perftools-dev libgtest-dev libisal-dev libjudy-dev libpam0g-dev libspdlog-dev libsystemd-dev libthrift-dev libtirpc-dev liburcu-dev libyaml-cpp-dev netcat-openbsd python3-venv uuid-dev zlib1g-dev docbook docbook-xml krb5-user libacl1-dev libcap-dev libcephfs-dev libdbus-1-dev libglusterfs-dev libgssapi-krb5-2 libjemalloc-dev libkrb5-dev libkrb5support0 libnfsidmap-dev libradospp-dev libradosstriper-dev librgw-dev libsqlite3-dev xfslibs-dev \
-        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree 
+        acl asciidoc attr automake bash-completion bc ccache cmake curl dbench debhelper devscripts fakeroot fio fuse3 gcc git gnupg2 kmod lcov make nfs4-acl-tools pkg-config pylint python3-pip python3-setuptools python3-wheel psmisc rsync rsyslog socat sudo tidy time valgrind wget bison byacc ceph dbus doxygen flex tree
 
 
 WORKDIR /saunafs
@@ -27,7 +27,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     ./tests/setup_machine.sh setup /mnt/hdd_0 /mnt/hdd_1 /mnt/hdd_2 /mnt/hdd_3 /mnt/hdd_4 /mnt/hdd_5 /mnt/hdd_6 /mnt/hdd_7 || true
 
 RUN mkdir -p /mnt/hdd_0/ /mnt/hdd_1/ /mnt/hdd_2/ /mnt/hdd_3/ /mnt/hdd_4/ /mnt/hdd_5/ /mnt/hdd_6/ /mnt/hdd_7/
-RUN chown saunafstest:saunafstest -R /mnt/hdd_* 
+RUN chown saunafstest:saunafstest -R /mnt/hdd_*
 
 ### Build Phase
 FROM test-setup AS test-build

diff --git a/main.go b/main.go
@@ -39,7 +39,8 @@ type testOptions struct {
 	Source           string
 	TestPattern      string
 	MountPoint       string
-    SkipUpgradeTests bool
+	CoreMount        string
+	SkipUpgradeTests bool
 	AllOutput        bool
 	DeleteContainers bool
 	Multiplier       int
@@ -74,6 +75,8 @@ func init() {
 
 	flag.StringVar(&options.MountPoint, "mount", "", "SaunaFS git repository to mount")
 	flag.StringVar(&options.MountPoint, "m", "", "shorthand for -mount")
+
+	flag.StringVar(&options.CoreMount, "core-mount", "", "Mount place for cores")
 }
 
 const (
@@ -91,6 +94,8 @@ var hostConfig = container.HostConfig{
 				CgroupPermissions: "rwm",
 			},
 		},
+		CpusetCpus: os.Getenv("NUMA_CPUSET"),
+		CpusetMems: os.Getenv("NUMA_MEM_NODE"),
 		Ulimits: []*units.Ulimit{
 			{
 				Name: "core",
@@ -161,9 +166,14 @@ func runTests(ctx context.Context, client *client.Client) int {
 	tests := make([]*Test, 0, len(suite))
 
 	if options.MountPoint != "" {
-		hostConfig.Mounts = []mount.Mount{
-			{Type: mount.TypeBind, Source: options.MountPoint, Target: "/saunafs"},
-		}
+		hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
+			Type: mount.TypeBind, Source: options.MountPoint, Target: "/saunafs",
+		})
+	}
+	if options.CoreMount != "" {
+		hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
+			Type: mount.TypeBind, Source: options.CoreMount, Target: filepath.Dir(corePattern),
+		})
 	}
 
 	var wg sync.WaitGroup
@@ -395,7 +405,7 @@ func getTestGlobs(ctx context.Context, client *client.Client) map[string][]strin
 	suites := getSuites(ctx, client, name)
 	for suite := range suites {
 		execConfig := types.ExecConfig{
-			Cmd:          []string{"bash", "-c", "ls -1 /saunafs/tests/test_suites/" + suite + "/" + options.TestPattern},
+			Cmd:          []string{"bash", "-c", "ls -1 /saunafs/tests/test_suites/" + suite + "/" + options.TestPattern + ".sh"},
 			AttachStdout: true,
 			AttachStderr: false,
 		}