mirror of
https://github.com/google/nomulus.git
synced 2025-04-30 20:17:51 +02:00
8e33bc898f
Currently, if for some reason publishDnsUpdates gets a request to publish domains to a DnsWriter that doesn't belong to said domain - it logs a warning but published anyway. This can happen when Writers are changed (swapped for a different writer) leaving update commands "stuck" with the wrong writer. Normally you'd expect these update commands to just publish their data and be on their way. However, if the update fails for some reason (likely - if the Writer change happened BECAUSE the updates are failing) then the same publishDnsUpdate command will continue to run forever. This CL changes the behavior for "publish to wrong DnsWriter" to instead requeue the batched domains / hosts back to the Dns-pull queue, allowing them to be re-batched (and hence published) with the correct DnsWriter(s). This re-batching will take place in ReadDnsQueueAction.java ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=177863076
55 lines
2 KiB
Java
55 lines
2 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.dns;
|
|
|
|
import static com.google.common.base.Preconditions.checkState;
|
|
import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
import google.registry.dns.writer.DnsWriter;
|
|
import google.registry.model.registry.Registry;
|
|
import google.registry.util.FormattingLogger;
|
|
import java.util.Map;
|
|
import javax.inject.Inject;
|
|
|
|
/** Proxy for retrieving {@link DnsWriter} implementations. */
|
|
public final class DnsWriterProxy {
|
|
|
|
private static final FormattingLogger logger = getLoggerForCallerClass();
|
|
|
|
private final ImmutableMap<String, DnsWriter> dnsWriters;
|
|
|
|
@Inject
|
|
DnsWriterProxy(Map<String, DnsWriter> dnsWriters) {
|
|
this.dnsWriters = ImmutableMap.copyOf(dnsWriters);
|
|
}
|
|
|
|
/**
|
|
* Returns the instance of {@link DnsWriter} by class name.
|
|
*
|
|
* If the DnsWriter doesn't belong to this TLD, will return null.
|
|
*/
|
|
public DnsWriter getByClassNameForTld(String className, String tld) {
|
|
if (!Registry.get(tld).getDnsWriters().contains(className)) {
|
|
logger.warningfmt(
|
|
"Loaded potentially stale DNS writer %s which is not active on TLD %s.",
|
|
className, tld);
|
|
return null;
|
|
}
|
|
DnsWriter dnsWriter = dnsWriters.get(className);
|
|
checkState(dnsWriter != null, "Could not load DnsWriter %s for TLD %s", className, tld);
|
|
return dnsWriter;
|
|
}
|
|
}
|