Vijay-1 commented on a change in pull request #1908: Changes for Backup Edge Cache Group URL: https://github.com/apache/incubator-trafficcontrol/pull/1908#discussion_r172019644
########## File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java ########## @@ -675,17 +678,40 @@ public CacheLocation getCoverageZoneCacheLocation(final String ip, final String return cacheLocation; } - // We had a hit in the CZF but the name does not match a known cache location. - // Check whether the CZF entry has a geolocation and use it if so. - return getClosestCacheLocation(cacheRegister.filterAvailableLocations(deliveryServiceId), networkNode.getGeolocation(), cacheRegister.getDeliveryService(deliveryServiceId)); + if (networkNode.getBackupLoc() != null) { + for (final String element : networkNode.getBackupLoc()) { + final CacheLocation bkCacheLocation = getCacheRegister().getCacheLocationById(element); + if (bkCacheLocation != null && !getSupportingCaches(bkCacheLocation.getCaches(), deliveryService).isEmpty()) { + LOGGER.debug("Got backup CZ cache group " + bkCacheLocation.getId() + " for " + ip + ", ds " + deliveryServiceId); + if (track != null) { + track.setFromBackupCzGroup(true); + } + return bkCacheLocation; + } + } + } + + if (networkNode.isUseClosest()) { + // We had a hit in the CZF but the name does not match a known cache location. + // Check whether the CZF entry has a geolocation and use it if so. + final CacheLocation closestCacheLocation = getClosestCacheLocation(cacheRegister.filterAvailableLocations(deliveryServiceId), networkNode.getGeolocation(), cacheRegister.getDeliveryService(deliveryServiceId)); + if (closestCacheLocation != null) { + LOGGER.debug("Got closest CZ cache group " + closestCacheLocation.getId() + " for " + ip + ", ds " + deliveryServiceId); + if (track != null) { + track.setFromBackupCzGroup(true); Review comment: I believe, any thing other than the exact match on the subnet, is backup. (i.e) both co-ordinates and Backup Cache Groups are fallback mechanism and hence i feel this if-block should be fine ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services