zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-15 08:57:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make LockHandlerImpl.clock transient

Browse source 
SystemClock isn't Serializable (for obvious reasons), whereas LockHandlerImpl is
used as a field on some Serializable mapreduce classes. So mark it transient and
then re-generate it on first use following de-serialization when it happens to
be null.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=201707209
This commit is contained in:
mcilwain 2018-06-22 10:43:21 -07:00 • committed by Ben McIlwain
parent 0422205d84
commit 8245d2f1c4
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
java/google/registry/request/lock/LockHandlerImpl.java
View file

@ -27,6 +27,8 @@ import google.registry.model.server.Lock;
import google.registry.util.AppEngineTimeLimiter;
import google.registry.util.Clock;
import google.registry.util.RequestStatusChecker;
import google.registry.util.SystemClock;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
@ -40,19 +42,30 @@ import org.joda.time.DateTime;
import org.joda.time.Duration;
/** Implementation of {@link LockHandler} that uses the datastore lock. */
public class LockHandlerImpl implements LockHandler {
private static final long serialVersionUID = 6551645164118637767L;
public class LockHandlerImpl implements LockHandler, Serializable {
private static final long serialVersionUID = 5162259753801400985L;
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
/** Fudge factor to make sure we kill threads before a lock actually expires. */
private static final Duration LOCK_TIMEOUT_FUDGE = Duration.standardSeconds(5);
@Inject Clock clock;
@Inject RequestStatusChecker requestStatusChecker;
private final RequestStatusChecker requestStatusChecker;
@Nullable private transient Clock clock;
@Inject public LockHandlerImpl() {}
@Inject
public LockHandlerImpl(RequestStatusChecker requestStatusChecker, Clock clock) {
this.requestStatusChecker = requestStatusChecker;
this.clock = clock;
}
private synchronized Clock getClock() {
// Re-set the clock on first use after de-serialization
if (clock == null) {
clock = new SystemClock();
}
return clock;
}
/**
* Acquire one or more locks and execute a Void {@link Callable}.
@ -70,7 +83,7 @@ public class LockHandlerImpl implements LockHandler {
@Nullable String tld,
Duration leaseLength,
String... lockNames) {
DateTime startTime = clock.nowUtc();
DateTime startTime = getClock().nowUtc();
String sanitizedTld = Strings.emptyToNull(tld);
try {
return AppEngineTimeLimiter.create()
@ -87,7 +100,7 @@ public class LockHandlerImpl implements LockHandler {
"Execution on locks '%s' for TLD '%s' timed out after %s; started at %s",
Joiner.on(", ").join(lockNames),
Optional.ofNullable(sanitizedTld).orElse("(null)"),
new Duration(startTime, clock.nowUtc()),
new Duration(startTime, getClock().nowUtc()),
startTime),
cause);
}
@ -113,10 +126,7 @@ public class LockHandlerImpl implements LockHandler {
final Set<String> lockNames;
LockingCallable(
Callable<Void> delegate,
String tld,
Duration leaseLength,
String... lockNames) {
Callable<Void> delegate, String tld, Duration leaseLength, String... lockNames) {
checkArgument(leaseLength.isLongerThan(LOCK_TIMEOUT_FUDGE));
this.delegate = delegate;
this.tld = tld;