server: implement swap support

haircommander · haircommander · commit cd8bc4c1f750 · 2021-10-19T19:41:27.000-04:00
Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git a/server/container_create_linux.go b/server/container_create_linux.go
@@ -367,9 +367,18 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrIface.Contai
 					return nil, err
 				}
 				specgen.SetLinuxResourcesMemoryLimit(memoryLimit)
-				if node.CgroupHasMemorySwap() {
-					specgen.SetLinuxResourcesMemorySwap(memoryLimit)
+				if resources.MemorySwapLimitInBytes != 0 {
+					if 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(),
+							resources.MemorySwapLimitInBytes,
+							resources.MemoryLimitInBytes,
+						)
+					}
+					memoryLimit = resources.MemorySwapLimitInBytes
 				}
+				specgen.SetLinuxResourcesMemorySwap(memoryLimit)
 			}
 
 			specgen.SetProcessOOMScoreAdj(int(resources.OomScoreAdj))
diff --git a/test/cgroups.bats b/test/cgroups.bats
@@ -36,3 +36,37 @@ function teardown() {
 	output=$(systemctl status "crio-conmon-$pod_id.scope")
 	[[ "$output" == *"customcrioconmon.slice"* ]]
 }
+
+@test "ctr with swap should be configured" {
+	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 = 210763776
+	 	|     .linux.resources.memory_limit_in_bytes = 209715200' \
+		"$TESTDATA"/container_sleep.json > "$newconfig"
+
+	ctr_id=$(crictl run "$newconfig" "$TESTDATA"/sandbox_config.json)
+	set_swap_fields_given_cgroup_version
+
+	if test -r "$CGROUP_MEM_SWAP_FILE"; then
+		output=$(crictl exec --sync "$ctr_id" sh -c "cat $CGROUP_MEM_SWAP_FILE")
+		[[ "$output" == "210763776" ]]
+	fi
+}
+
+@test "ctr with swap should fail when swap is lower" {
+	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 = 209715200
+	    |     .linux.resources.memory_limit_in_bytes = 210763776' \
+		"$TESTDATA"/container_sleep.json > "$newconfig"
+
+	! crictl run "$newconfig" "$TESTDATA"/sandbox_config.json
+}
diff --git a/test/ctr.bats b/test/ctr.bats
@@ -731,13 +731,7 @@ function check_oci_annotation() {
 	ctr_id=$(crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config.json)
 	crictl start "$ctr_id"
 
-	# set memory {,swap} max file for cgroupv1 or v2
-	CGROUP_MEM_SWAP_FILE="/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
-	CGROUP_MEM_FILE="/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	if is_cgroup_v2; then
-		CGROUP_MEM_SWAP_FILE="/sys/fs/cgroup/memory.swap.max"
-		CGROUP_MEM_FILE="/sys/fs/cgroup/memory.max"
-	fi
+	set_swap_fields_given_cgroup_version
 
 	output=$(crictl exec --sync "$ctr_id" sh -c "cat $CGROUP_MEM_FILE")
 	[[ "$output" == *"209715200"* ]]
diff --git a/test/helpers.bash b/test/helpers.bash
@@ -566,3 +566,13 @@ runtime_type = "$RUNTIME_TYPE"
 allowed_annotations = ["$ANNOTATION"]
 EOF
 }
+
+function set_swap_fields_given_cgroup_version() {
+    # set memory {,swap} max file for cgroupv1 or v2
+    export CGROUP_MEM_SWAP_FILE="/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
+    export CGROUP_MEM_FILE="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+    if is_cgroup_v2; then
+        export CGROUP_MEM_SWAP_FILE="/sys/fs/cgroup/memory.swap.max"
+        export CGROUP_MEM_FILE="/sys/fs/cgroup/memory.max"
+    fi
+}
