Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loop over FDs if close_range fails. #3989

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

simonvik
Copy link
Contributor

close_range is still a somewhat new function and its common that the userspace in a container is newer than the kernel.

This fixes #3988

@simonvik simonvik requested a review from dridi October 11, 2023 13:44
@simonvik simonvik mentioned this pull request Oct 13, 2023
Comment on lines 41 to 43
#ifdef HAVE_WORKING_CLOSE_RANGE
#elif HAVE_CLOSEFROM
#else
# include <dirent.h>
#ifndef HAVE_CLOSEFROM
#include <dirent.h>
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please bring back the # include indentation, it's nested inside an #ifdef.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indented

lib/libvarnish/vsub.c Outdated Show resolved Hide resolved
@simonvik simonvik force-pushed the continueoncloserange branch from af04219 to 48ecb03 Compare October 16, 2023 07:00
@dridi
Copy link
Member

dridi commented Oct 16, 2023

The failure for the ASAN job is a test case taking more than a minute, so not timing out stuck somewhere in the script.

@dridi dridi merged commit 2c38ba0 into varnishcache:master Oct 16, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docker varnish
2 participants