File ganglia-0013-downgrade-udp-recv-buffer-length-c... of Package ganglia

Overview Repositories Revisions Requests Users Attributes Meta

File ganglia-0013-downgrade-udp-recv-buffer-length-check.patch of Package ganglia (Revision 698bae7dd4e576e8cd6745ac7a343437)

Currently displaying revision 698bae7dd4e576e8cd6745ac7a343437 , Show latest

From: Chris Burroughs <chris.burroughs@gmail.com>
Date: Mon, 17 Oct 2016 18:06:11 -0400
Git-commit: e267c6cf690c679b2010bc36bf8e400f865097b8
References: bsc#1087487
Subject: [PATCH] downgrade udp recv buffer length check

The 2x SO_RCVBUF behavior is specific to Linux.  When requesting the
size of a buffer an OS might reasonably say it's exactly the size you
just asked for.  This is the behavior on Illumos and FreeBSD.

To avoid a thicket of environment specific conditionals while
accommodating Linux, downgrade to a log warning instead of
EXIT_FAILURE.

NOTE: Removed the now misleading APR 0.9.4 warning.  That version was
released in 2003.
Acked-by: John Jolly <jjolly@suse.de>
---
 gmond/gmond.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gmond/gmond.c b/gmond/gmond.c
index 507ef61b..a188dfd9 100644
--- a/gmond/gmond.c
+++ b/gmond/gmond.c
@@ -775,16 +775,15 @@ setup_listen_channels_pollset( void )
 
                   if(buffer)
                     {
-                      /* RB: getsockopt() returns double SO_RCVBUF since kernel reserves overhead space */
+                      /* NOTE: getsockopt() returns double SO_RCVBUF on Linux for reserved overhead space */
                       if(rx_buf_sz!=(buffer*2))
                         {
-                          err_msg("Error setting UDP receive buffer for port %d bind=%s to size: %d.\n",
+                          err_msg("WARNING When setting UDP receive buffer for port %d bind=%s to size: %d.\n",
                             port, bindaddr? bindaddr: "unspecified", (apr_int32_t) buffer);
-                          err_msg("Reported buffer size by OS: %d : does not match config setting %d.\n",
-                            (int) (rx_buf_sz/2), (int) buffer);
-                          err_msg("NOTE: only supported on systems that have Apache Portable Runtime library version 0.9.4 or higher.\n");
-                          err_msg("Check Operating System (kernel) limits, change or disable buffer size. Exiting.\n");
-                          exit(EXIT_FAILURE);
+                          err_msg("Reported raw buffer size by OS: %d : config setting %d. Unable to verify\n",
+                            (int) rx_buf_sz, (int) buffer);
+                          err_msg("NOTE: Linux will report twice the configured value.  See socket(7).\n");
+                          err_msg("Check Operating System (kernel) limits, change or disable buffer size.\n");
                         }
                       else
                         { /* RB: Eureka */
-- 
2.13.6

Places

File ganglia-0013-downgrade-udp-recv-buffer-length-check.patch of Package ganglia (Revision 698bae7dd4e576e8cd6745ac7a343437)

Places