This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 7.0.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 1387c5f1d4dace420b9c6977b14441a001f4b597
Author: Phil Sorber <sor...@apache.org>
AuthorDate: Thu Sep 15 08:38:39 2016 -0600
TS-4868: Add configs back and cleanup other cluster init
(cherry picked from commit 81475fb8d320eef45f1a5607812cd63e016e3b40)
---
cmd/traffic_cop/traffic_cop.cc | 4 --
mgmt/RecordsConfig.cc | 87 ++++++++++++++++++++++++++++++++++++++++++
mgmt/cluster/ClusterCom.cc | 20 +---------
3 files changed, 88 insertions(+), 23 deletions(-)
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index d5537a1..edaee09 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -600,7 +600,6 @@ config_reload_records()
struct stat stat_buf;
static time_t last_mod = 0;
char log_filename[PATH_NAME_MAX];
- int tmp_int;
ats_scoped_str bindir;
ats_scoped_str logdir;
@@ -657,9 +656,6 @@ config_reload_records()
config_read_int("proxy.config.cop.source_port", &source_port, true);
#endif
- config_read_int("proxy.local.cluster.type", &tmp_int);
- cluster_type = static_cast<MgmtClusterType>(tmp_int);
-
if (stdout_flag) {
config_read_string("proxy.config.syslog_facility", syslog_fac_str,
sizeof(syslog_fac_str), true);
process_syslog_config();
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 57d49a0..663b6d7 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -237,6 +237,30 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.lm.pserver_timeout_msecs", RECD_INT, "0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.cluster.delta_thresh", RECD_INT, "30",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.peer_timeout", RECD_INT, "30",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.mc_send_interval", RECD_INT, "2",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.mc_poll_timeout", RECD_INT, "5",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.startup_timeout", RECD_INT, "10",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ //# cluster type requires restart to change
+ //# 1 is full clustering, 2 is mgmt only, 3 is no clustering
+ {RECT_LOCAL, "proxy.local.cluster.type", RECD_INT, "3", RECU_RESTART_TM,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.rsport", RECD_INT, "8088", RECU_NULL,
RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.mcport", RECD_INT, "8089", RECU_DYNAMIC,
RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.mc_group_addr", RECD_STRING,
"224.0.1.37", RECU_DYNAMIC, RR_REQUIRED, RECC_IP,
"[0-255]\\.[0-255]\\.[0-255]\\.[0-255]", RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.mc_ttl", RECD_INT, "1", RECU_DYNAMIC,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.log_bogus_mc_msgs", RECD_INT, "1",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.admin.synthetic_port", RECD_INT, "8083",
RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.autoconf.localhost_only", RECD_INT, "1",
RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
@@ -604,6 +628,8 @@ static const RecordElement RecordsConfig[] =
// that the response has a Content-Length: header, with a value of "0".
{RECT_CONFIG, "proxy.config.http.cache.allow_empty_doc", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL }
,
+ {RECT_CONFIG, "proxy.config.http.cache.cluster_cache_local", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.http.cache.ignore_client_no_cache", RECD_INT,
"1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.cache.ignore_client_cc_max_age", RECD_INT,
"1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
@@ -834,6 +860,61 @@ static const RecordElement RecordsConfig[] =
//##############################################################################
//#
+ //# Cluster Subsystem
+ //#
+
//##############################################################################
+ {RECT_CONFIG, "proxy.config.cluster.threads", RECD_INT, "1",
RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-512]", RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.cluster_port", RECD_INT, "8086",
RECU_RESTART_TS, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.cluster_configuration", RECD_STRING,
"cluster.config", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.ethernet_interface", RECD_STRING,
TS_BUILD_DEFAULT_LOOPBACK_IFACE, RECU_RESTART_TS, RR_REQUIRED, RECC_STR,
"^[^[:space:]]*$", RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.enable_monitor", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.monitor_interval_secs", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.send_buffer_size", RECD_INT, "10485760",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.receive_buffer_size", RECD_INT,
"10485760", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.sock_option_flag", RECD_INT, "0x0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.sock_packet_mark", RECD_INT, "0x0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.sock_packet_tos", RECD_INT, "0x0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.rpc_cache_cluster", RECD_INT, "0",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+
+ //##################################################################
+ //# Cluster interconnect load monitoring configuration options.
+ //# Internal use only
+ //##################################################################
+ //# load monitor_enabled: -1 = compute only, 0 = disable, 1 = compute and act
+ {RECT_CONFIG, "proxy.config.cluster.load_monitor_enabled", RECD_INT, "1",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.ping_send_interval_msecs", RECD_INT,
"100", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.ping_response_buckets", RECD_INT, "100",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.msecs_per_ping_response_bucket",
RECD_INT, "50", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.ping_latency_threshold_msecs", RECD_INT,
"500", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.load_compute_interval_msecs", RECD_INT,
"5000", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.periodic_timer_interval_msecs",
RECD_INT, "100", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.ping_history_buf_length", RECD_INT,
"120", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.cluster_load_clear_duration", RECD_INT,
"24", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.cluster.cluster_load_exceed_duration", RECD_INT,
"4", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+
//##############################################################################
+ //#
//# Hit Evacuation
//#
//##############################################################################
@@ -986,6 +1067,12 @@ static const RecordElement RecordsConfig[] =
// # move entries to the owner on a lookup?
{RECT_CONFIG, "proxy.config.hostdb.migrate_on_demand", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ // # find DNS results on another node in the cluster?
+ {RECT_CONFIG, "proxy.config.hostdb.cluster", RECD_INT, "0", RECU_DYNAMIC,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ // # find DNS results for round-robin hosts on another node in the
cluster?
+ {RECT_CONFIG, "proxy.config.hostdb.cluster.round_robin", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
// # round-robin addresses for single clients
// # (can cause authentication problems)
{RECT_CONFIG, "proxy.config.hostdb.strict_round_robin", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 31c75d8..aa7502c 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -364,26 +364,8 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int
mcport, char *group, i
our_ip = oip;
/* Get the cluster type */
- cluster_type = CLUSTER_INVALID;
- RecInt rec_int;
+ cluster_type = NO_CLUSTER;
- rec_err = RecGetRecordInt("proxy.local.cluster.type", &rec_int);
- cluster_type = (MgmtClusterType)rec_int;
- found = (rec_err == REC_ERR_OKAY);
- ink_assert(found);
-
- switch (cluster_type) {
- case FULL_CLUSTER:
- case MGMT_CLUSTER:
- case NO_CLUSTER:
- break;
- case CLUSTER_INVALID:
- default:
- mgmt_log("[ClusterCom::ClusterCom] Invalid cluster type. "
- "Defaulting to full clustering\n");
- cluster_type = FULL_CLUSTER;
- break;
- }
/* Get the cluster config file name + path */
RecString cluster_file;
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.
