rawlinp commented on a change in pull request #4409: Optimize TR DNSSEC zone
re-signing
URL: https://github.com/apache/trafficcontrol/pull/4409#discussion_r382641008
##########
File path:
traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
##########
@@ -460,18 +499,37 @@ private static void generateZones(final TrafficRouter
tr, final LoadingCache<Zon
LOGGER.fatal("Unable to create zone: " +
ex.getMessage(), ex);
}
- primeZoneCache(domain, name, list, tr, zc, dzc,
generationTasks, primingTasks, ds);
+ primeZoneCache(domain, name, list, tr, zc, dzc,
generationTasks, primingTasks, ds, newDomainsToZoneKeys);
return records;
}
- @SuppressWarnings("PMD.CyclomaticComplexity")
+ @SuppressWarnings({"PMD.CyclomaticComplexity",
"PMD.ExcessiveParameterList"})
private static void primeZoneCache(final String domain, final Name
name, final List<Record> list, final TrafficRouter tr,
final LoadingCache<ZoneKey, Zone> zc, final
LoadingCache<ZoneKey, Zone> dzc, final List<Runnable> generationTasks,
- final BlockingQueue<Runnable> primingTasks, final
DeliveryService ds) {
+ final BlockingQueue<Runnable> primingTasks, final
DeliveryService ds, final ConcurrentMap<String, ZoneKey> newDomainsToZoneKeys) {
generationTasks.add(() -> {
try {
- final Zone zone =
zc.get(signatureManager.generateZoneKey(name, list)); // cause the zone to be
loaded into the new cache
+ final ZoneKey newZoneKey =
signatureManager.generateZoneKey(name, list);
+ if (tr.isDnssecZoneDiffingEnabled() &&
domainsToZoneKeys.containsKey(domain)) {
Review comment:
Yeah, I think I will just keep the block as-is because I'd rather not add
extra `zc.gets` and multi-returns just to remove a level of indentation. In
this case I think one extra level of indentation is fine, especially since it's
a relatively small block. Once the zone-diffing feature becomes vetted I would
like to come back here and remove the feature flag for it, and just always do
zone-diffing (with or without dnssec enabled). That will remove a level of
indentation here in the future.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
