Add bats test for zombie conmon cleanup

lack · lack · commit 9fada28f76db · 2022-03-22T12:10:28.000-04:00
In cri-o#5500, defensive code was added to ensure all child processes are cleaned up when conmon early initialization fails. This bats test forces one of the error scenarios (by adding an unparseable workload annotation to a container) and then ensures no zombies leak in this failure scenario. Verified by temporarily reverting cri-o#5500 (test fails with 10 zombies created), then bringing back cri-o#5500 (test passes) Signed-off-by: Jim Ramsay <jramsay@redhat.com>
diff --git a/test/pod.bats b/test/pod.bats
@@ -1,4 +1,5 @@
 #!/usr/bin/env bats
+# vim:set ft=bash :
 
 load helpers
 
diff --git a/test/workloads.bats b/test/workloads.bats
@@ -1,4 +1,5 @@
 #!/usr/bin/env bats
+# vim:set ft=bash :
 
 load helpers
 
@@ -327,3 +328,35 @@ function check_conmon_fields() {
 	df=$(crictl exec --sync "$ctr_id" df | grep /dev/shm)
 	[[ "$df" == *'16384'* ]]
 }
+
+@test "test resource cleanup on bad annotation contents" {
+	shares="200"
+	set="0-2"
+	name=helloctr
+	create_workload "$shares" "0"
+
+	start_crio
+
+	jq --arg act "$activation" --arg set "{\"cpuset\": \"$set\"}" --arg setkey "$prefix/$name" \
+		'   .annotations[$act] = "true"
+		|   .annotations[$setkey] = $set' \
+		"$TESTDATA"/sandbox_config.json > "$sboxconfig"
+	pod_id=$(crictl runp "$sboxconfig")
+
+	# Forceibly fail 10 container creations via bad workload annotation:
+	for id in {1..10}; do
+		ctrconfig="$TESTDIR/ctr-$id.json"
+		jq --arg act "$activation" --arg name "$name-$id" --arg set "invalid & unparsable {\"cpuset\": \"$set\"}" --arg setkey "$prefix/POD" \
+			'   .annotations[$act] = "true"
+			|   .annotations[$setkey] = $set
+			|   .metadata.name = $name' \
+			"$TESTDATA"/container_sleep.json > "$ctrconfig"
+		ctr_id=$(crictl create "$pod_id" "$ctrconfig" "$sboxconfig" || true)
+		[[ $ctr_id == "" ]]
+	done
+	# Ensure there are no conmon zombies leftover
+	children=$(ps --ppid "$CRIO_PID" -o state= -o pid= -o cmd= || true)
+	zombies=$(grep -c '^Z ' <<< "$children" || true)
+	echo "Zombies: $zombies"
+	[[ $zombies == 0 ]]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/usr/bin/env bats`
	`2`	`+# vim:set ft=bash :`
`2`	`3`
`3`	`4`	`load helpers`
`4`	`5`