* [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh
@ 2024-09-19 10:43 Phil Sutter
2024-09-19 12:02 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Phil Sutter @ 2024-09-19 10:43 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
If the client can't reach the server, the latter remains listening
forever. Kill it after 3s of waiting.
Fixes: 867d2190799ab ("selftests: netfilter: add ipvs test script")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
tools/testing/selftests/net/netfilter/ipvs.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/testing/selftests/net/netfilter/ipvs.sh b/tools/testing/selftests/net/netfilter/ipvs.sh
index 4ceee9fb3949..59d7aecbd887 100755
--- a/tools/testing/selftests/net/netfilter/ipvs.sh
+++ b/tools/testing/selftests/net/netfilter/ipvs.sh
@@ -107,6 +107,10 @@ client_connect() {
}
verify_data() {
+ waitpid -t 3 "${server_pid}"
+ if [ $? -eq 3 ]; then
+ kill "${server_pid}"
+ fi
wait "${server_pid}"
cmp "$infile" "$outfile" 2>/dev/null
}
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh
2024-09-19 10:43 [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh Phil Sutter
@ 2024-09-19 12:02 ` Pablo Neira Ayuso
2024-09-19 12:08 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2024-09-19 12:02 UTC (permalink / raw)
To: Phil Sutter; +Cc: netfilter-devel
On Thu, Sep 19, 2024 at 12:43:56PM +0200, Phil Sutter wrote:
> If the client can't reach the server, the latter remains listening
> forever. Kill it after 3s of waiting.
Applied to nf.git, thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh
2024-09-19 12:02 ` Pablo Neira Ayuso
@ 2024-09-19 12:08 ` Pablo Neira Ayuso
2024-09-19 12:38 ` Phil Sutter
0 siblings, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2024-09-19 12:08 UTC (permalink / raw)
To: Phil Sutter; +Cc: netfilter-devel
On Thu, Sep 19, 2024 at 02:02:51PM +0200, Pablo Neira Ayuso wrote:
> On Thu, Sep 19, 2024 at 12:43:56PM +0200, Phil Sutter wrote:
> > If the client can't reach the server, the latter remains listening
> > forever. Kill it after 3s of waiting.
>
> Applied to nf.git, thanks
Too fast. One of my test machine has not waitpid, there is no usage of
waitpid in other existing selftest scripts?
What am I missing here? :)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh
2024-09-19 12:08 ` Pablo Neira Ayuso
@ 2024-09-19 12:38 ` Phil Sutter
0 siblings, 0 replies; 4+ messages in thread
From: Phil Sutter @ 2024-09-19 12:38 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
On Thu, Sep 19, 2024 at 02:08:42PM +0200, Pablo Neira Ayuso wrote:
> On Thu, Sep 19, 2024 at 02:02:51PM +0200, Pablo Neira Ayuso wrote:
> > On Thu, Sep 19, 2024 at 12:43:56PM +0200, Phil Sutter wrote:
> > > If the client can't reach the server, the latter remains listening
> > > forever. Kill it after 3s of waiting.
> >
> > Applied to nf.git, thanks
>
> Too fast. One of my test machine has not waitpid, there is no usage of
> waitpid in other existing selftest scripts?
Yeah, I only see "wait" being used in other scripts which is a
bash-builtin. I needed waitpid for its timeout option.
> What am I missing here? :)
My v2 which uses 'timeout' command as used for the client already. :)
Cheers, Phil
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-19 12:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-19 10:43 [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh Phil Sutter
2024-09-19 12:02 ` Pablo Neira Ayuso
2024-09-19 12:08 ` Pablo Neira Ayuso
2024-09-19 12:38 ` Phil Sutter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).