Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-25 11:04:35 +00:00
Code Issues Projects Releases Wiki Activity

tcp_read_sysctl_limits: hide a useless error, leave a warning

Browse source 
When running tests, there are a lot of errors like this:

 (00.000053) Error (sysctl.c:367): Can't open sysctl net/ipv4/tcp_rmem: No such file or directory

As Andrew explained, tests are running in a netns that lacks
this sysctl. Use CTL_FLAGS_OPTIONAL flag to hide the error message.

Since with this flag sysctl_op() will most probably return 0,
add an additional check for vect[0] == 0 to detect that the file
was not read and show an appropriate warning, i.e.
"TCP mem sysctls are not available. Using defaults."

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin 2015-10-14 15:09:57 -07:00 • committed by Pavel Emelyanov
parent b1599c3d1c
commit 75fa3c6e29
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kerndat.c
View file

@ -214,7 +214,7 @@ static int tcp_read_sysctl_limits(void)
int ret;
struct sysctl_req req[] = {
{ "net/ipv4/tcp_rmem", &vect, CTL_U32A(ARRAY_SIZE(vect)) },
{ "net/ipv4/tcp_rmem", &vect, CTL_U32A(ARRAY_SIZE(vect)), CTL_FLAGS_OPTIONAL },
};
/*
@ -222,7 +222,7 @@ static int tcp_read_sysctl_limits(void)
* availabe for send/read queues on restore.
*/
ret = sysctl_op(req, ARRAY_SIZE(req), CTL_READ, 0);
if (ret) {
if (ret || vect[0] == 0) {
pr_warn("TCP mem sysctls are not available. Using defaults.\n");
goto out;
}