Avoid bogus journal filling errors

Issue #454 is likely caused by retryable_error() not catching all possible retriable errors from the write(2) syscall. This PR should be FeeBSD compatible. The only retriable result in question is ENOBUFS which might be bound to network latencies. Hope these are acceptable. Signed-off-by: Jindrich Novy <[email protected]>
containers · Dec 6, 2024 · 02c6ea6 · 02c6ea6
1 parent 680af40
commit 02c6ea6
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/utils.c b/src/utils.c
@@ -49,17 +49,10 @@ void set_conmon_logs(char *level_name, char *cid_, gboolean syslog_, char *tag)
 	nexitf("No such log level %s", level_name);
 }
 
-#ifdef __FreeBSD__
 static bool retryable_error(int err)
 {
-	return err == EINTR || err == EAGAIN;
+	return err == EINTR || err == EAGAIN || err == ENOBUFS;
 }
-#else
-static bool retryable_error(int err)
-{
-	return err == EINTR;
-}
-#endif
 
 static void get_signal_descriptor_mask(sigset_t *set)
 {