shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

test: refactor test-procfs-util for clarity and skip test on perm failure

Browse Source 
After commit c3dead53d5 the test can fail
if the procfs file(s) aren't writable, because the check for permission
failure happens after a call that will never fail, since setting the
limit to the existing limit will always pass.

This also refactors the function slightly to make the test var names
clearer.
This commit is contained in:
Dan Streetman 2021-11-05 16:56:16 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent 2d8840eb66
commit bf47f71c1c
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/test/test-procfs-util.c
View File

@ -11,7 +11,7 @@
int main(int argc, char *argv[]) {
nsec_t nsec;
uint64_t v, w;
uint64_t v, pid_max, threads_max, limit;
int r;
log_parse_environment();
@ -26,40 +26,51 @@ int main(int argc, char *argv[]) {
assert_se(procfs_tasks_get_current(&v) >= 0);
log_info("Current number of tasks: %" PRIu64, v);
v = TASKS_MAX;
r = procfs_get_pid_max(&v);
assert(r >= 0 || r == -ENOENT || ERRNO_IS_PRIVILEGE(r));
log_info("kernel.pid_max: %"PRIu64, v);
pid_max = TASKS_MAX;
r = procfs_get_pid_max(&pid_max);
if (r == -ENOENT || ERRNO_IS_PRIVILEGE(r))
return log_tests_skipped_errno(r, "can't get pid max");
assert(r >= 0);
log_info("kernel.pid_max: %"PRIu64, pid_max);
w = TASKS_MAX;
r = procfs_get_threads_max(&w);
assert(r >= 0 || r == -ENOENT || ERRNO_IS_PRIVILEGE(r));
log_info("kernel.threads-max: %"PRIu64, w);
threads_max = TASKS_MAX;
r = procfs_get_threads_max(&threads_max);
if (r == -ENOENT || ERRNO_IS_PRIVILEGE(r))
return log_tests_skipped_errno(r, "can't get threads max");
assert(r >= 0);
log_info("kernel.threads-max: %"PRIu64, threads_max);
v = MIN(v - (v > 0), w);
limit = MIN(pid_max - (pid_max > 0), threads_max);
assert_se(r >= 0);
log_info("Limit of tasks: %" PRIu64, v);
assert_se(v > 0);
r = procfs_tasks_set_limit(v);
if (r == -ENOENT || ERRNO_IS_PRIVILEGE(r))
return log_tests_skipped("can't set task limits");
assert(r >= 0);
log_info("Limit of tasks: %" PRIu64, limit);
assert_se(limit > 0);
if (v > 100) {
log_info("Reducing limit by one to %"PRIu64"…", v-1);
/* This call should never fail, as we're trying to set it to the same limit */
assert(procfs_tasks_set_limit(limit) >= 0);
r = procfs_tasks_set_limit(v-1);
log_info_errno(r, "procfs_tasks_set_limit: %m");
assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || r == -EROFS);
if (limit > 100) {
log_info("Reducing limit by one to %"PRIu64"…", limit-1);
assert_se(procfs_get_threads_max(&w) >= 0);
assert_se(r >= 0 ? w == v - 1 : w == v);
r = procfs_tasks_set_limit(limit-1);
if (IN_SET(r, -ENOENT, -EROFS) || ERRNO_IS_PRIVILEGE(r))
return log_tests_skipped_errno(r, "can't set tasks limit");
assert_se(r >= 0);
assert_se(procfs_tasks_set_limit(v) >= 0);
assert_se(procfs_get_pid_max(&v) >= 0);
/* We never decrease the pid_max, so it shouldn't have changed */
assert_se(v == pid_max);
assert_se(procfs_get_threads_max(&w) >= 0);
assert_se(v == w);
assert_se(procfs_get_threads_max(&v) >= 0);
assert_se(v == limit-1);
assert_se(procfs_tasks_set_limit(limit) >= 0);
assert_se(procfs_get_pid_max(&v) >= 0);
assert_se(v == pid_max);
assert_se(procfs_get_threads_max(&v) >= 0);
assert_se(v == limit);
}
return 0;