From 246f40856cfa035bf21785d1a5601d3fc1d7f00e Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 10 Feb 2005 05:55:19 +0000 Subject: [PATCH] b=5277 r=adilger Andreas's patch to avoid starting duplicate acceptors on servers with multiple IP hostaddrs. --- lustre/ChangeLog | 1 + lustre/utils/lconf | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 0fec309..b82fdf3 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -19,6 +19,7 @@ tbd Cluster File Systems, Inc. - block device patches to fix I/O request sizes in 2.6 (5482) - look up hostnames for IB nals (5602) - 2.6 changed lock ordering of 2 semaphores, caused deadlock (5654) + - don't start multiple acceptors for the same port (5277) * miscellania - service request history (4965) - put {ll,lov,osc}_async_page structs in a single slab (4699) diff --git a/lustre/utils/lconf b/lustre/utils/lconf index c6049b8..9a2b7a7 100755 --- a/lustre/utils/lconf +++ b/lustre/utils/lconf @@ -2262,9 +2262,8 @@ def find_local_clusters(node_db): debug("add_local", netuuid) local_clusters.append((srv.net_type, srv.cluster_id, srv.nid)) if srv.port > 0: - if acceptors.has_key(srv.port): - panic("duplicate port:", srv.port) - acceptors[srv.port] = AcceptorHandler(srv.port, srv.net_type) + if not acceptors.has_key(srv.port): + acceptors[srv.port] = AcceptorHandler(srv.port, srv.net_type) # This node is a gateway. is_router = 0 -- 1.8.3.1