Merge pull request #6150 from haircommander/unlimited-swap-1.24

openshift-merge-robot · web-flow · commit 4929a75281a8 · 2023-02-07T05:44:24.000-05:00
[1.24] server: allow for kubelet to specify -1 for swap
diff --git a/server/container_create_linux.go b/server/container_create_linux.go
@@ -393,7 +393,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrfactory.Cont
 				}
 				specgen.SetLinuxResourcesMemoryLimit(memoryLimit)
 				if resources.MemorySwapLimitInBytes != 0 {
-					if resources.MemorySwapLimitInBytes < resources.MemoryLimitInBytes {
+					if resources.MemorySwapLimitInBytes > 0 && resources.MemorySwapLimitInBytes < resources.MemoryLimitInBytes {
 						return nil, errors.Errorf(
 							"container %s create failed because memory swap limit (%d) cannot be lower than memory limit (%d)",
 							ctr.ID(),
diff --git a/test/cgroups.bats b/test/cgroups.bats
@@ -89,6 +89,25 @@ function teardown() {
 	jq -e .linux.resources.memory.swap "$(runtime list | grep "$ctr_id" | awk '{ print $4 }')/config.json"
 }
 
+@test "ctr with swap should succeed when swap is unlimited" {
+	if ! grep -v Filename < /proc/swaps; then
+		skip "swap not enabled"
+	fi
+	start_crio
+	# memsw should be greater than or equal to memory limit
+	# 210763776 = 1024*1024*200
+	jq '	  .linux.resources.memory_swap_limit_in_bytes = -1
+	    |     .linux.resources.memory_limit_in_bytes = 210763776' \
+		"$TESTDATA"/container_sleep.json > "$newconfig"
+
+	ctr_id=$(crictl run "$newconfig" "$TESTDATA"/sandbox_config.json)
+
+	if test -r "$CGROUP_MEM_SWAP_FILE"; then
+		output=$(crictl exec --sync "$ctr_id" sh -c "cat $CGROUP_MEM_SWAP_FILE")
+		[[ $output -gt 210763776 ]]
+	fi
+}
+
 @test "cgroupv2 unified support" {
 	if ! is_cgroup_v2; then
 		skip "node must be configured with cgroupv2 for this test"

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrfactory.Cont`
`393`	`393`	`}`
`394`	`394`	`specgen.SetLinuxResourcesMemoryLimit(memoryLimit)`
`395`	`395`	`if resources.MemorySwapLimitInBytes != 0 {`
`396`		`- if resources.MemorySwapLimitInBytes < resources.MemoryLimitInBytes {`
	`396`	`+ if resources.MemorySwapLimitInBytes > 0 && resources.MemorySwapLimitInBytes < resources.MemoryLimitInBytes {`
`397`	`397`	`return nil, errors.Errorf(`
`398`	`398`	`"container %s create failed because memory swap limit (%d) cannot be lower than memory limit (%d)",`
`399`	`399`	`ctr.ID(),`