This is an automated email from the ASF dual-hosted git repository. ocket8888 pushed a commit to branch 5.1.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 885f68dd4c32098369a51a0424b3389fd053c14b Author: Rima Shah <[email protected]> AuthorDate: Mon Apr 5 16:26:39 2021 -0600 Fixed GET api/3.1/cdns/routing endpoint to avoid incorrect success response (return all zeros) (#5709) * Added debug statements * Removed debug fmt statements and updated the return error as it was returning incorrect err value. * Updated TR's stat tracker to include long int Update CHANGELOG.md Removed unnecessary new lines * Updated TR's stat tracker to include long int-1 (cherry picked from commit b31db78965ee66dd5abea1508f732bdc42cafe0c) --- CHANGELOG.md | 1 + traffic_ops/traffic_ops_golang/crstats/routing.go | 3 +-- .../traffic_router/core/router/StatTracker.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaab102..738fc5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#5604](https://github.com/apache/trafficcontrol/issues/5604) - traffic_monitor.log is no longer truncated when restarting Traffic Monitor - [#1624](https://github.com/apache/trafficcontrol/issues/1624) - Fixed ORT to reload Traffic Server if LUA scripts are added or changed. - #5554 - TM UI overflows screen width and hides table data +- Fixed the return error for GET api `cdns/routing` to avoid incorrect success response. ## [5.1.0] - 2021-02-21 diff --git a/traffic_ops/traffic_ops_golang/crstats/routing.go b/traffic_ops/traffic_ops_golang/crstats/routing.go index 6a18ebc..bd720c0 100644 --- a/traffic_ops/traffic_ops_golang/crstats/routing.go +++ b/traffic_ops/traffic_ops_golang/crstats/routing.go @@ -102,10 +102,9 @@ func getRoutersRouting(tx *sql.Tx, routers map[tc.CDNName][]string, statType *st close(resp) dat := RouterData{} - for r := range resp { if r.Error != nil { - return tc.Routing{}, err + return tc.Routing{}, r.Error } dat = addCRSStats(dat, r.Stats, statType, hostRegex) } diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java index 6546b87..0aac2c9 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java @@ -318,32 +318,32 @@ public class StatTracker { public Map<String, Tallies> getHttpMap() { return httpMap; } - public int getTotalDnsCount() { + public long getTotalDnsCount() { return totalDnsCount; } public long getAverageDnsTime() { if(totalDnsCount==0) { return 0; } return totalDnsTime/totalDnsCount; } - public int getTotalHttpCount() { + public long getTotalHttpCount() { return totalHttpCount; } public long getAverageHttpTime() { if(totalHttpCount==0) { return 0; } return totalHttpTime/totalHttpCount; } - public int getTotalDsMissCount() { + public long getTotalDsMissCount() { return totalDsMissCount; } - public void setTotalDsMissCount(final int totalDsMissCount) { + public void setTotalDsMissCount(final long totalDsMissCount) { this.totalDsMissCount = totalDsMissCount; } - private int totalDnsCount; + private long totalDnsCount; private long totalDnsTime; - private int totalHttpCount; + private long totalHttpCount; private long totalHttpTime; - private int totalDsMissCount = 0; + private long totalDsMissCount = 0; public Map<String,Long> getUpdateTracker() { return TrafficRouterManager.getTimeTracker(); }
