Fix TM2 DSStatsThreadsafe to be passed as a Reader
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/44543606 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/44543606 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/44543606 Branch: refs/heads/master Commit: 445436069c16adbbdff15bf06a87179be7feb5f2 Parents: fa4d2e5 Author: Robert Butts <robert.o.bu...@gmail.com> Authored: Fri Oct 21 15:17:28 2016 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Fri Oct 28 15:04:12 2016 -0600 ---------------------------------------------------------------------- .../experimental/traffic_monitor/manager/datarequest.go | 2 +- .../experimental/traffic_monitor/manager/opsconfig.go | 2 +- .../experimental/traffic_monitor/manager/stathistory.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44543606/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go ---------------------------------------------------------------------- diff --git a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go index 6a7fd9c..ccb7447 100644 --- a/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go +++ b/traffic_monitor/experimental/traffic_monitor/manager/datarequest.go @@ -420,7 +420,7 @@ func DataRequest( peerStates peer.CRStatesPeersThreadsafe, combinedStates peer.CRStatesThreadsafe, statHistory StatHistoryThreadsafe, - dsStats DSStatsThreadsafe, + dsStats DSStatsReader, events EventsThreadsafe, staticAppData StaticAppData, healthPollInterval time.Duration, http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44543606/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go ---------------------------------------------------------------------- diff --git a/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go b/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go index 03448dc..cdb78eb 100644 --- a/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go +++ b/traffic_monitor/experimental/traffic_monitor/manager/opsconfig.go @@ -55,7 +55,7 @@ func StartOpsConfigManager( combinedStates peer.CRStatesThreadsafe, statHistory StatHistoryThreadsafe, lastStats LastStatsThreadsafe, - dsStats DSStatsThreadsafe, + dsStats DSStatsReader, events EventsThreadsafe, staticAppData StaticAppData, healthPollInterval time.Duration, http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44543606/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go ---------------------------------------------------------------------- diff --git a/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go b/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go index 20a9e2c..7af7e2c 100644 --- a/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go +++ b/traffic_monitor/experimental/traffic_monitor/manager/stathistory.go @@ -98,7 +98,7 @@ func StartStatHistoryManager( errorCount UintThreadsafe, cfg config.Config, monitorConfig TrafficMonitorConfigMapThreadsafe, -) (StatHistoryThreadsafe, DurationMapThreadsafe, LastStatsThreadsafe, DSStatsThreadsafe, UnpolledCachesThreadsafe) { +) (StatHistoryThreadsafe, DurationMapThreadsafe, LastStatsThreadsafe, DSStatsReader, UnpolledCachesThreadsafe) { statHistory := NewStatHistoryThreadsafe(cfg.MaxStatHistory) lastStatDurations := NewDurationMapThreadsafe() lastStatEndTimes := map[enum.CacheName]time.Time{} @@ -136,7 +136,7 @@ func StartStatHistoryManager( } } }() - return statHistory, lastStatDurations, lastStats, dsStats, unpolledCaches + return statHistory, lastStatDurations, lastStats, &dsStats, unpolledCaches } // processStatResults processes the given results, creating and setting DSStats, LastStats, and other stats. Note this is NOT threadsafe, and MUST NOT be called from multiple threads.
