summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2021-01-15 14:49:27 -0800
committergVisor bot <gvisor-bot@google.com>2021-01-15 14:51:51 -0800
commitc7fc4a5d66dc5d6680219819f872c070a0590ca9 (patch)
tree136e899b1c58430dde41f055f2f8a94532e8517d
parent9db126eb65ada4b2233ccb85a0e9c402b7efc5de (diff)
Add fsstress tests
Updates #5273 PiperOrigin-RevId: 352088736
-rw-r--r--Makefile5
-rw-r--r--images/basic/fsstress/Dockerfile17
-rwxr-xr-ximages/basic/fsstress/run.sh17
-rw-r--r--test/fsstress/BUILD25
-rw-r--r--test/fsstress/fsstress.go16
-rw-r--r--test/fsstress/fsstress_test.go62
6 files changed, 142 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8a1c4321c..41cc67f2c 100644
--- a/Makefile
+++ b/Makefile
@@ -295,6 +295,11 @@ packetimpact-tests: load-packetimpact $(RUNTIME_BIN)
@$(call test_runtime,$(RUNTIME),--jobs=HOST_CPUS*3 --local_test_jobs=HOST_CPUS*3 //test/packetimpact/tests:all_tests)
.PHONY: packetimpact-tests
+fsstress-test: load-basic $(RUNTIME_BIN)
+ @$(call install_runtime,$(RUNTIME),--vfs2)
+ @$(call test_runtime,$(RUNTIME),//test/fsstress:fsstress_test)
+.PHONY: fsstress-test
+
# Specific containerd version tests.
containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-basic_resolv load-basic_httpd load-basic_ubuntu $(RUNTIME_BIN)
@$(call install_runtime,$(RUNTIME),) # Clear flags.
diff --git a/images/basic/fsstress/Dockerfile b/images/basic/fsstress/Dockerfile
new file mode 100644
index 000000000..84604ead5
--- /dev/null
+++ b/images/basic/fsstress/Dockerfile
@@ -0,0 +1,17 @@
+# Usage: docker run --rm fsstress -d /test -n 10000 -p 100 -X -v
+FROM alpine
+
+RUN apk add git
+RUN git clone https://github.com/linux-test-project/ltp.git --depth 1
+
+WORKDIR /ltp
+RUN ./travis/alpine.sh
+RUN make autotools && ./configure
+RUN make -C testcases/kernel/fs/fsstress
+RUN cp ./testcases/kernel/fs/fsstress/fsstress /usr/bin
+RUN rm -rf /fsstress /tmp
+
+WORKDIR /
+# This is required, otherwise running with -p > 1 prematurelly exits.
+COPY run.sh .
+ENTRYPOINT ["/run.sh"]
diff --git a/images/basic/fsstress/run.sh b/images/basic/fsstress/run.sh
new file mode 100755
index 000000000..ebb7a37ad
--- /dev/null
+++ b/images/basic/fsstress/run.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Copyright 2021 The gVisor Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+/usr/bin/fsstress "$@" \ No newline at end of file
diff --git a/test/fsstress/BUILD b/test/fsstress/BUILD
new file mode 100644
index 000000000..d262c8554
--- /dev/null
+++ b/test/fsstress/BUILD
@@ -0,0 +1,25 @@
+load("//tools:defs.bzl", "go_library", "go_test")
+
+package(licenses = ["notice"])
+
+go_test(
+ name = "fsstress_test",
+ size = "large",
+ srcs = [
+ "fsstress_test.go",
+ ],
+ library = ":fsstress",
+ tags = [
+ # Requires docker and runsc to be configured before the test runs.
+ "manual",
+ "local",
+ ],
+ deps = [
+ "//pkg/test/dockerutil",
+ ],
+)
+
+go_library(
+ name = "fsstress",
+ srcs = ["fsstress.go"],
+)
diff --git a/test/fsstress/fsstress.go b/test/fsstress/fsstress.go
new file mode 100644
index 000000000..464237e2d
--- /dev/null
+++ b/test/fsstress/fsstress.go
@@ -0,0 +1,16 @@
+// Copyright 2021 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package fsstress is empty. See fsstress_test.go for description.
+package fsstress
diff --git a/test/fsstress/fsstress_test.go b/test/fsstress/fsstress_test.go
new file mode 100644
index 000000000..63f692ca9
--- /dev/null
+++ b/test/fsstress/fsstress_test.go
@@ -0,0 +1,62 @@
+// Copyright 2021 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package fsstress runs fsstress tool inside a docker container.
+package fsstress
+
+import (
+ "context"
+ "math/rand"
+ "strconv"
+ "strings"
+ "testing"
+ "time"
+
+ "gvisor.dev/gvisor/pkg/test/dockerutil"
+)
+
+func init() {
+ rand.Seed(int64(time.Now().Nanosecond()))
+}
+
+func fsstress(t *testing.T, dir string) {
+ ctx := context.Background()
+ d := dockerutil.MakeContainer(ctx, t)
+ defer d.CleanUp(ctx)
+
+ const (
+ operations = "10000"
+ processes = "100"
+ image = "basic/fsstress"
+ )
+ seed := strconv.FormatUint(uint64(rand.Uint32()), 10)
+ args := []string{"-d", dir, "-n", operations, "-p", processes, "-seed", seed, "-X"}
+ t.Logf("Repro: docker run --rm --runtime=runsc %s %s", image, strings.Join(args, ""))
+ out, err := d.Run(ctx, dockerutil.RunOpts{Image: image}, args...)
+ if err != nil {
+ t.Fatalf("docker run failed: %v\noutput: %s", err, out)
+ }
+ lines := strings.SplitN(out, "\n", 2)
+ if len(lines) > 1 || !strings.HasPrefix(out, "seed =") {
+ t.Fatalf("unexpected output: %s", out)
+ }
+}
+
+func TestFsstressGofer(t *testing.T) {
+ fsstress(t, "/test")
+}
+
+func TestFsstressTmpfs(t *testing.T) {
+ fsstress(t, "/tmp")
+}