svn commit: r1196817 - in /trafficserver/traffic/trunk: CHANGES mgmt/RecordsConfig.cc proxy/ICP.cc proxy/Main.cc

[amc]

Author: amc
Date: Wed Nov  2 21:47:39 2011
New Revision: 1196817

URL: http://svn.apache.org/viewvc?rev=1196817&view=rev
Log:
TS-1009: Do not start ICP contiunations if ICP is not enabled.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
    trafficserver/traffic/trunk/proxy/ICP.cc
    trafficserver/traffic/trunk/proxy/Main.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1196817&r1=1196816&r2=1196817&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Wed Nov  2 21:47:39 2011
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.1
+  *) TS-1009 Disable starting ICP continuations if ICP is not
+    enabled.
+
   *) TS-1005 Use traffic_line for reload option with RC script.
    Author: Jan-Frode Myklebust.
 

Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1196817&r1=1196816&r2=1196817&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Wed Nov  2 21:47:39 2011
@@ -1368,7 +1368,7 @@ RecordElement RecordsConfig[] = {
   //#       enabled=1 Allow receive of ICP queries
   //#       enabled=2 Allow send/receive of ICP queries
   
//##############################################################################
-  {RECT_CONFIG, "proxy.config.icp.enabled", RECD_INT, "0", RECU_DYNAMIC, 
RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.icp.enabled", RECD_INT, "0", RECU_RESTART_TS, 
RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.icp.stale_icp_enabled", RECD_INT, "0", 
RECU_DYNAMIC, RR_NULL, RECC_INT, NULL, RECA_NULL}
   ,

Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=1196817&r1=1196816&r2=1196817&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Wed Nov  2 21:47:39 2011
@@ -2295,11 +2295,13 @@ ICPProcessor::Reconfigure(int global_con
   _ICPConfig->UpdateGlobalConfig();
   _ICPConfig->UpdatePeerConfig();
 
-  int status;
-  if ((status = BuildPeerList()) == 0) {
-    status = SetupListenSockets();
+  int status = -1;
+  if (_ICPConfig->globalConfig()->ICPconfigured()) {
+    if ((status = BuildPeerList()) == 0) {
+      status = SetupListenSockets();
+    }
+    DumpICPConfig();
   }
-  DumpICPConfig();
   return status;
 }
 

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1196817&r1=1196816&r2=1196817&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Wed Nov  2 21:47:39 2011
@@ -1868,9 +1868,14 @@ main(int argc, char **argv)
     TS_ReadConfigInteger(http_enabled, "proxy.config.http.enabled");
 
     if (http_enabled) {
+#ifndef INK_NO_ICP
+      int icp_enabled = 0;
+      TS_ReadConfigInteger(icp_enabled, "proxy.config.icp.enabled");
+#endif
       start_HttpProxyServer(http_accept_file_descriptor, 
http_accept_port_number, ssl_accept_file_descriptor, num_accept_threads);
 #ifndef INK_NO_ICP
-      icpProcessor.start();
+      if (icp_enabled)
+        icpProcessor.start();
 #endif
     }