trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject [1/2] git commit: TS-1469: Manager can cause restart spins because of hardcoded FD limit
Date Wed, 22 May 2013 11:45:37 GMT
Updated Branches:
  refs/heads/3.2.x 9b43fd49e -> ae1c20e4b


TS-1469: Manager can cause restart spins because of hardcoded FD limit

Conflicts:
	CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ae1f9913
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ae1f9913
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ae1f9913

Branch: refs/heads/3.2.x
Commit: ae1f9913616fed06a092835ac268782cec8e0694
Parents: 9b43fd4
Author: Brian Geffon <briang@apache.org>
Authored: Fri Sep 14 14:13:49 2012 -0700
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Wed May 22 13:16:15 2013 +0200

----------------------------------------------------------------------
 CHANGES                  |    3 +++
 mgmt/web2/WebIntrMain.cc |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae1f9913/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ffc1f26..ad3d386 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.2.5
 
+  *) [TS-1483] Manager uses hardcoded FD limit causing restarts
+   forever on traffic_server.
+
   *) [TS-1784] Fix FreeBSD block calculation (both RAW and directory)
 
   *) [TS-1905] TS hangs (dead lock) on HTTPS POST/PROPFIND requests.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae1f9913/mgmt/web2/WebIntrMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebIntrMain.cc b/mgmt/web2/WebIntrMain.cc
index a0d8f24..210a1df 100644
--- a/mgmt/web2/WebIntrMain.cc
+++ b/mgmt/web2/WebIntrMain.cc
@@ -490,7 +490,7 @@ webIntr_main(void *x)
     }
 
     // TODO: Should we check return value?
-    mgmt_select(32, &selectFDs, (fd_set *) NULL, (fd_set *) NULL, NULL);
+    mgmt_select(FD_SETSIZE, &selectFDs, (fd_set *) NULL, (fd_set *) NULL, NULL);
 
     if (autoconfFD >= 0 && FD_ISSET(autoconfFD, &selectFDs)) {
       acceptFD = autoconfFD;


Mime
View raw message