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

Add sanity check on commit log deletion

Browse source 
I know the query that finds commit logs already should ignore commit logs
that are too young, but this adds an explicit sanity check for safety's
sake, so we don't have to depend solely on an indexed query for safety.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162386413
This commit is contained in:
mcilwain 2017-07-18 12:21:50 -07:00 • committed by Ben McIlwain
parent 268abbc383
commit d9613cf69a
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
java/google/registry/backup/DeleteOldCommitLogsAction.java
View file

@ -18,13 +18,14 @@ import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
import static google.registry.util.PipelineUtils.createJobPath; import static google.registry.util.PipelineUtils.createJobPath;
import static java.lang.Boolean.FALSE;
import com.google.appengine.tools.mapreduce.Mapper; import com.google.appengine.tools.mapreduce.Mapper;
import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.Reducer;
import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.appengine.tools.mapreduce.ReducerInput;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators; import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key; import com.googlecode.objectify.Key;
import com.googlecode.objectify.Work; import com.googlecode.objectify.Work;
import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.Config;
@ -94,7 +95,7 @@ public final class DeleteOldCommitLogsAction implements Runnable {
.setDefaultReduceShards(NUM_REDUCE_SHARDS) .setDefaultReduceShards(NUM_REDUCE_SHARDS)
.runMapreduce( .runMapreduce(
new DeleteOldCommitLogsMapper(), new DeleteOldCommitLogsMapper(),
new DeleteOldCommitLogsReducer(isDryRun), new DeleteOldCommitLogsReducer(deletionThreshold, isDryRun),
ImmutableList.of( ImmutableList.of(
new CommitLogManifestInput(Optional.of(deletionThreshold)), new CommitLogManifestInput(Optional.of(deletionThreshold)),
EppResourceInputs.createEntityInput(EppResource.class))))); EppResourceInputs.createEntityInput(EppResource.class)))));
@ -146,11 +147,13 @@ public final class DeleteOldCommitLogsAction implements Runnable {
private static class DeleteOldCommitLogsReducer private static class DeleteOldCommitLogsReducer
extends Reducer<Key<CommitLogManifest>, Boolean, Void> { extends Reducer<Key<CommitLogManifest>, Boolean, Void> {
private static final long serialVersionUID = -5122986392078633220L; private static final long serialVersionUID = -4918760187627937268L;
private final DateTime deletionThreshold;
private final boolean isDryRun; private final boolean isDryRun;
DeleteOldCommitLogsReducer(boolean isDryRun) { DeleteOldCommitLogsReducer(DateTime deletionThreshold, boolean isDryRun) {
this.deletionThreshold = deletionThreshold;
this.isDryRun = isDryRun; this.isDryRun = isDryRun;
} }
@ -158,10 +161,15 @@ public final class DeleteOldCommitLogsAction implements Runnable {
public void reduce( public void reduce(
final Key<CommitLogManifest> manifestKey, final Key<CommitLogManifest> manifestKey,
ReducerInput<Boolean> canDeleteVerdicts) { ReducerInput<Boolean> canDeleteVerdicts) {
if (Iterators.contains(canDeleteVerdicts, false)) { if (ImmutableSet.copyOf(canDeleteVerdicts).contains(FALSE)) {
getContext().incrementCounter("old commit log manifests still referenced"); getContext().incrementCounter("old commit log manifests still referenced");
return; return;
} }
if (ofy().load().key(manifestKey).now().getCommitTime().isAfter(deletionThreshold)) {
logger.severefmt("Won't delete CommitLogManifest %s that is too recent.", manifestKey);
getContext().incrementCounter("manifests incorrectly assigned for deletion (SEE LOGS)");
return;
}
Integer deletedCount = ofy().transact(new Work<Integer>() { Integer deletedCount = ofy().transact(new Work<Integer>() {
@Override @Override
public Integer run() { public Integer run() {