ulnds/socklnd must close open socket after unsuccessful

'say hello' attempt.

b=13279
i=maxim
i=adilger

diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index 1e8a65c..23df79f 100644 (file)
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -12,6 +12,14 @@
        mxlnd     - MX 1.2.1 or later
        ptllnd    - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
 
        mxlnd     - MX 1.2.1 or later
        ptllnd    - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
 

+Severity   : normal
+Bugzilla   : 13279
+Description: open files rlimit 1024 reached while liblustre testing
+Details    : ulnds/socklnd must close open socket after unsuccessful
+             'say hello' attempt.
+
+------------------------------------------------------------------------------
+

 2007-07-30  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.11 / 1.6.1
        * Support for networks:
 2007-07-30  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.11 / 1.6.1
        * Support for networks:

diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c
index 51aa535..b429060 100644 (file)
--- a/lnet/ulnds/socklnd/connection.c
+++ b/lnet/ulnds/socklnd/connection.c
@@ -491,8 +491,10 @@ connection force_tcp_connection(manager    m,
     }
     
     /* say hello */
     }
     
     /* say hello */

-    if (tcpnal_hello(fd, nid))
+    if (tcpnal_hello(fd, nid)) {
+            close(fd);

             goto out;
             goto out;

+    }

     
     conn = allocate_connection(m, nid, fd);
     
     
     conn = allocate_connection(m, nid, fd);