Add an auto update time field to the Cursor entity

Also adjusts the nomulus list_cursors command to output the value of this field.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=206646117
This commit is contained in:
mcilwain 2018-07-30 14:21:14 -07:00 committed by jianglai
parent 3941249dfe
commit f614044681
6 changed files with 62 additions and 14 deletions

View file

@ -18,6 +18,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
import google.registry.model.translators.UpdateAutoTimestampTranslatorFactory;
import java.util.Optional;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
/**
@ -29,12 +30,12 @@ public class UpdateAutoTimestamp extends ImmutableObject {
DateTime timestamp;
/** Returns the timestamp, or {@link #START_OF_TIME} if it's null. */
/** Returns the timestamp, or {@link START_OF_TIME} if it's null. */
public DateTime getTimestamp() {
return Optional.ofNullable(timestamp).orElse(START_OF_TIME);
}
public static UpdateAutoTimestamp create(DateTime timestamp) {
public static UpdateAutoTimestamp create(@Nullable DateTime timestamp) {
UpdateAutoTimestamp instance = new UpdateAutoTimestamp();
instance.timestamp = timestamp;
return instance;

View file

@ -25,6 +25,7 @@ import com.googlecode.objectify.annotation.Entity;
import com.googlecode.objectify.annotation.Id;
import com.googlecode.objectify.annotation.Parent;
import google.registry.model.ImmutableObject;
import google.registry.model.UpdateAutoTimestamp;
import google.registry.model.registry.Registry;
import org.joda.time.DateTime;
@ -108,6 +109,13 @@ public class Cursor extends ImmutableObject {
DateTime cursorTime = START_OF_TIME;
/** An automatically managed timestamp of when this object was last written to Datastore. */
UpdateAutoTimestamp lastUpdateTime = UpdateAutoTimestamp.create(null);
public DateTime getLastUpdateTime() {
return lastUpdateTime.getTimestamp();
}
/**
* Checks that the type of the scoped object (or null) matches the required type for the specified
* cursor (or null, if the cursor is a global cursor).

View file

@ -19,6 +19,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Strings;
import com.googlecode.objectify.Key;
import google.registry.model.common.Cursor;
import google.registry.model.common.Cursor.CursorType;
@ -27,6 +28,7 @@ import google.registry.model.registry.Registry;
import google.registry.model.registry.Registry.TldType;
import google.registry.tools.Command.RemoteApiCommand;
import java.util.Map;
import java.util.Optional;
/** Lists {@link Cursor} timestamps used by locking rolling cursor tasks, like in RDE. */
@Parameters(separators = " =", commandDescription = "Lists cursor timestamps used by LRC tasks")
@ -45,6 +47,8 @@ final class ListCursorsCommand implements RemoteApiCommand {
description = "Filter TLDs to only include those with RDE escrow enabled; defaults to false.")
private boolean filterEscrowEnabled = false;
private static final String OUTPUT_FMT = "%-20s %-24s %-24s";
@Override
public void run() {
Map<Registry, Key<Cursor>> registries =
@ -55,18 +59,26 @@ final class ListCursorsCommand implements RemoteApiCommand {
.filter(r -> !filterEscrowEnabled || r.getEscrowEnabled())
.collect(toImmutableMap(r -> r, r -> Cursor.createKey(cursorType, r)));
Map<Key<Cursor>, Cursor> cursors = ofy().load().keys(registries.values());
registries
.entrySet()
.stream()
.map(e -> renderLine(e.getKey().getTldStr(), e.getValue(), cursors))
.sorted()
.forEach(System.out::println);
if (!registries.isEmpty()) {
String header = String.format(OUTPUT_FMT, "TLD", "Cursor Time", "Last Update Time");
System.out.printf("%s\n%s\n", header, Strings.repeat("-", header.length()));
registries
.entrySet()
.stream()
.map(
e ->
renderLine(
e.getKey().getTldStr(), Optional.ofNullable(cursors.get(e.getValue()))))
.sorted()
.forEach(System.out::println);
}
}
private static String renderLine(
String tld, Key<Cursor> cursorKey, Map<Key<Cursor>, Cursor> cursors) {
private static String renderLine(String tld, Optional<Cursor> cursor) {
return String.format(
"%-25s%s",
cursors.containsKey(cursorKey) ? cursors.get(cursorKey).getCursorTime() : "(absent)", tld);
OUTPUT_FMT,
tld,
cursor.map(c -> c.getCursorTime().toString()).orElse("(absent)"),
cursor.map(c -> c.getLastUpdateTime().toString()).orElse("(absent)"));
}
}