You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/03/02 03:39:41 UTC
[2/7] incubator-trafficcontrol git commit: Change TM2 to poll
slightly under targets
Change TM2 to poll slightly under targets
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/391dc6fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/391dc6fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/391dc6fa
Branch: refs/heads/master
Commit: 391dc6fa3b39f4556f7cb3878b558bea7786f93e
Parents: c877c07
Author: Robert Butts <ro...@gmail.com>
Authored: Mon Feb 27 15:53:58 2017 -0700
Committer: David Neuman <da...@gmail.com>
Committed: Wed Mar 1 20:39:10 2017 -0700
----------------------------------------------------------------------
.../traffic_monitor/manager/monitorconfig.go | 6 ++++++
traffic_monitor_golang/traffic_monitor/version.go | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/391dc6fa/traffic_monitor_golang/traffic_monitor/manager/monitorconfig.go
----------------------------------------------------------------------
diff --git a/traffic_monitor_golang/traffic_monitor/manager/monitorconfig.go b/traffic_monitor_golang/traffic_monitor/manager/monitorconfig.go
index bb1c049..f8e2f87 100644
--- a/traffic_monitor_golang/traffic_monitor/manager/monitorconfig.go
+++ b/traffic_monitor_golang/traffic_monitor/manager/monitorconfig.go
@@ -140,6 +140,9 @@ func trafficOpsHealthPollIntervalToDuration(t int) time.Duration {
var healthPollCount int
+// PollIntervalRatio is the ratio of the configuration interval to poll. The configured intervals are 'target' times, so we actually poll at some small fraction less, in attempt to make the actual poll marginally less than the target.
+const PollIntervalRatio = float64(0.97) // TODO make config?
+
// getPollIntervals reads the Traffic Ops Client monitorConfig structure, and parses and returns the health, peer, and stat poll intervals
func getHealthPeerStatPollIntervals(monitorConfig to.TrafficMonitorConfigMap, cfg config.Config) (time.Duration, time.Duration, time.Duration, error) {
peerPollIntervalI, peerPollIntervalExists := monitorConfig.Config["peers.polling.interval"]
@@ -176,6 +179,9 @@ func getHealthPeerStatPollIntervals(monitorConfig to.TrafficMonitorConfigMap, cf
}
healthPollInterval := trafficOpsHealthPollIntervalToDuration(int(healthPollIntervalInt))
+ healthPollInterval = time.Duration(float64(healthPollInterval) * PollIntervalRatio)
+ peerPollInterval = time.Duration(float64(peerPollInterval) * PollIntervalRatio)
+ statPollInterval = time.Duration(float64(statPollInterval) * PollIntervalRatio)
return healthPollInterval, peerPollInterval, statPollInterval, nil
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/391dc6fa/traffic_monitor_golang/traffic_monitor/version.go
----------------------------------------------------------------------
diff --git a/traffic_monitor_golang/traffic_monitor/version.go b/traffic_monitor_golang/traffic_monitor/version.go
index 4d7eef9..bbabbd6 100644
--- a/traffic_monitor_golang/traffic_monitor/version.go
+++ b/traffic_monitor_golang/traffic_monitor/version.go
@@ -20,4 +20,4 @@ package main
*/
// Version is the current version of the app, in string form.
-var Version = "2.0.7"
+var Version = "2.0.8"