From d2f4f783028626838c956b9b0bd9f9faa449831f Mon Sep 17 00:00:00 2001 From: bas Date: Thu, 11 Oct 2012 13:33:54 +0000 Subject: [PATCH] applied client socket patch from Jonathan Barber git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@154 3f5042e3-fb1d-0410-be18-d6ca2573e517 --- CHANGELOG | 3 +++ src/mcom/MSU.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7bcab30..dbc6085 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,9 @@ Maui 3.3.2 everything (-f [user|group|acct|class|qos]). To show fairshare for a group, use: * diagnose -f group (Author: Dennis Stam and applied by Bas van der Vlies) - Showstats segfaults when using compiler optimization (Author: Andrew Savchenko, applied by Bas van der Vlies) + - catch socket errors for MSUAcceptClient. So no errors in the log file (Author: Jonathan Barber, applied + by Bas van der Vlies): + * accept call failed, errno: 11 (Resource temporarily unavailable) Maui 3.3.1 - Fixed issue where hostlist was being overwritten resulting in broken $PBS_NODEFILE. (Alexis Cousein) diff --git a/src/mcom/MSU.c b/src/mcom/MSU.c index fb4f8b0..aa916f8 100644 --- a/src/mcom/MSU.c +++ b/src/mcom/MSU.c @@ -809,6 +809,11 @@ int MSUAcceptClient( if ((sd = accept(S->sd,(struct sockaddr *)&c_sockaddr,&addrlen)) == -1) { + if (errno == EAGAIN || errno == EWOULDBLOCK) + { + return(FAILURE); + } + MDB(9,fSOCK) MLog("INFO: accept call failed, errno: %d (%s)\n", errno, strerror(errno));