This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 86d961216372f55226f52f9dce0e7f37f44b317e
Merge: 0ec497b 6c609d4
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Thu Sep 22 19:05:00 2016 -0700
Merge pull request #1035 from zwoop/TS-4866
TS-4866: Makes traffic_cop killing optional
cmd/traffic_cop/traffic_cop.cc | 74 +++++++++++++++++++++++------
doc/admin-guide/files/records.config.en.rst | 16 +++++++
mgmt/RecordsConfig.cc | 2 +
3 files changed, 78 insertions(+), 14 deletions(-)
diff --cc mgmt/RecordsConfig.cc
index 27f8caa,df67e7c..f82f807
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@@ -75,21 -75,23 +75,23 @@@ static const RecordElement RecordsConfi
{RECT_CONFIG, "proxy.config.crash_log_helper", RECD_STRING,
MGMT_CRASHLOG_HELPER, RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
// 0 - Disabled, 1 - enabled for important pages (e.g. cache directory), 2
- enabled for all pages
- {RECT_CONFIG, "proxy.config.mlock_enabled", RECD_INT, "0", RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.mlock_enabled", RECD_INT, "0", RECU_RESTART_TS,
RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.cop.core_signal", RECD_INT, "0", RECU_NULL,
RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.cop.core_signal", RECD_INT, "0", RECU_DYNAMIC,
RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
, // needed by traffic_cop
- {RECT_CONFIG, "proxy.config.cop.linux_min_swapfree_kb", RECD_INT, "0",
RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.cop.linux_min_swapfree_kb", RECD_INT, "0",
RECU_DYNAMIC, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
, // 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}
+ {RECT_CONFIG, "proxy.config.cop.linux_min_memfree_kb", RECD_INT, "0",
RECU_DYNAMIC, 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}
+ {RECT_CONFIG, "proxy.config.cop.init_sleep_time", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-900]", RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.cop.active_health_checks", RECD_INT, "3",
RECU_NULL, RR_NULL, RECC_NULL, "[0-3]", 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}
+ {RECT_CONFIG, "proxy.config.dump_mem_info_frequency", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//# 0 = disable
- {RECT_CONFIG, "proxy.config.http_ui_enabled", RECD_INT, "0", RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http_ui_enabled", RECD_INT, "0", RECU_DYNAMIC,
RR_NULL, RECC_NULL, "[0-3]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.cache.max_disk_errors", RECD_INT, "5",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.
