You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/03/28 16:21:11 UTC
[2/3] incubator-trafficcontrol git commit: Change TM2 ds-not-in-peer
log from warn to info
Change TM2 ds-not-in-peer log from warn to info
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7404cc69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7404cc69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7404cc69
Branch: refs/heads/master
Commit: 7404cc69f0f49e5438dc46fe19d2befe01b8f6e0
Parents: 1f65eca
Author: Robert Butts <ro...@gmail.com>
Authored: Tue Mar 7 14:52:39 2017 -0700
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Tue Mar 28 10:20:43 2017 -0600
----------------------------------------------------------------------
.../traffic_monitor/manager/statecombiner.go | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7404cc69/traffic_monitor_golang/traffic_monitor/manager/statecombiner.go
----------------------------------------------------------------------
diff --git a/traffic_monitor_golang/traffic_monitor/manager/statecombiner.go b/traffic_monitor_golang/traffic_monitor/manager/statecombiner.go
index 97f21e7..bb664fc 100644
--- a/traffic_monitor_golang/traffic_monitor/manager/statecombiner.go
+++ b/traffic_monitor_golang/traffic_monitor/manager/statecombiner.go
@@ -117,7 +117,17 @@ func combineCacheState(cacheName enum.CacheName, localCacheState peer.IsAvailabl
combinedStates.AddCache(cacheName, peer.IsAvailable{IsAvailable: available})
}
-func combineDSState(deliveryServiceName enum.DeliveryServiceName, localDeliveryService peer.Deliveryservice, events health.ThreadsafeEvents, peerOptimistic bool, peerStates peer.CRStatesPeersThreadsafe, localStates peer.Crstates, combinedStates peer.CRStatesThreadsafe, overrideMap map[enum.CacheName]bool, toData todata.TOData) {
+func combineDSState(
+ deliveryServiceName enum.DeliveryServiceName,
+ localDeliveryService peer.Deliveryservice,
+ events health.ThreadsafeEvents,
+ peerOptimistic bool,
+ peerStates peer.CRStatesPeersThreadsafe,
+ localStates peer.Crstates,
+ combinedStates peer.CRStatesThreadsafe,
+ overrideMap map[enum.CacheName]bool,
+ toData todata.TOData,
+) {
deliveryService := peer.Deliveryservice{IsAvailable: false, DisabledLocations: []enum.CacheGroupName{}} // important to initialize DisabledLocations, so JSON is `[]` not `null`
if localDeliveryService.IsAvailable {
deliveryService.IsAvailable = true
@@ -127,7 +137,7 @@ func combineDSState(deliveryServiceName enum.DeliveryServiceName, localDeliveryS
for peerName, iPeerStates := range peerStates.GetCrstates() {
peerDeliveryService, ok := iPeerStates.Deliveryservice[deliveryServiceName]
if !ok {
- log.Warnf("local delivery service %s not found in peer %s\n", deliveryServiceName, peerName)
+ log.Infof("local delivery service %s not found in peer %s\n", deliveryServiceName, peerName)
continue
}
if peerDeliveryService.IsAvailable {