You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/04/29 17:15:50 UTC
[1/2] trafficserver git commit: [TS-2490]: Allow traffic_cop to sleep
for a configured additional duration during startup before initiating heart
beat on traffic_server to allow for loading large config (e.g. remap files.)
Repository: trafficserver
Updated Branches:
refs/heads/master 078e8abd2 -> 6049e2012
[TS-2490]: Allow traffic_cop to sleep for a configured additional duration
during startup before initiating heart beat on traffic_server
to allow for loading large config (e.g. remap files.)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6de6a2b3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6de6a2b3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6de6a2b3
Branch: refs/heads/master
Commit: 6de6a2b3266642bdc25e308552221b7f2128e613
Parents: 078e8ab
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed Apr 29 15:11:20 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed Apr 29 15:11:20 2015 +0000
----------------------------------------------------------------------
cmd/traffic_cop/traffic_cop.cc | 11 +++++++++++
mgmt/RecordsConfig.cc | 2 ++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6de6a2b3/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 15a1cef..4b68870 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -107,6 +107,7 @@ static int server_failures = 0;
static int server_not_found = 0;
static const int sleep_time = 10; // 10 sec
+static int init_sleep_time = sleep_time; // 10 sec
static const int manager_timeout = 3 * 60; // 3 min
static const int server_timeout = 3 * 60; // 3 min
@@ -653,6 +654,7 @@ config_reload_records()
config_read_int("proxy.config.admin.autoconf_port", &autoconf_port, true);
config_read_int("proxy.config.cluster.rsport", &rs_port, true);
config_read_int("proxy.config.lm.sem_id", &sem_id, true);
+ config_read_int("proxy.config.cop.init_sleep_time", &init_sleep_time, true);
#if defined(linux)
// TS-1075 : auto-port ::connect DoS on high traffic linux systems
@@ -1348,6 +1350,10 @@ heartbeat_server()
// if it is taking too long to kill the server
//
safe_kill(server_lockfile, server_binary, false);
+ // Allow a configurable longer sleep init time
+ // to load very large remap files
+ cop_log_trace("performing additional sleep for %d sec during init", init_sleep_time);
+ millisleep(init_sleep_time * 1000);
}
} else {
if (server_failures)
@@ -1651,6 +1657,11 @@ check(void *arg)
ats_scoped_str runtimedir(config_read_runtime_dir());
TSInit(runtimedir, static_cast<TSInitOptionT>(TS_MGMT_OPT_NO_EVENTS));
mgmt_init = true;
+
+ // Allow a configurable longer sleep init time
+ // to load very large remap files
+ cop_log_trace("performing additional sleep for %d sec during init", init_sleep_time);
+ millisleep(init_sleep_time * 1000);
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6de6a2b3/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 1826427..8a77093 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -84,6 +84,8 @@ static const RecordElement RecordsConfig[] =
, // needed by traffic_cop
{RECT_CONFIG, "proxy.config.cop.linux_min_memfree_kb", RECD_INT, "0", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
, // needed by traffic_cop
+ {RECT_CONFIG, "proxy.config.cop.init_sleep_time", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, "[0-900]", RECA_NULL}
+ ,
//# 0 = disable (seconds)
{RECT_CONFIG, "proxy.config.dump_mem_info_frequency", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
[2/2] trafficserver git commit: update CHANGES
Posted by su...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6049e201
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6049e201
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6049e201
Branch: refs/heads/master
Commit: 6049e201214166b6162f1f18237cbf2f5cba391b
Parents: 6de6a2b
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed Apr 29 15:15:38 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed Apr 29 15:15:38 2015 +0000
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6049e201/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index eb6b45e..5b4004a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-2490] Allow traffic_cop to wait longer during traffic_server startup
+
*) [TS-3536] Fix memory leak in post processing.
*) [TS-3561] Call TSMutexDestroy in a couple of plugins, now that its