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

Delete applications even when index is missing

Browse source 
This makes the deletion mapreduce more resilient in the face of data integrity
violations (which exist on sandbox but hopefully not in production). Even when
the domain application index doesn't exist, we still want to delete the domain
application itself, as its continuing presence will cause problems after the
code for domain applications is deleted.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=228521794
This commit is contained in:
mcilwain 2019-01-09 08:26:26 -08:00 • committed by Ben McIlwain
parent ce29e73879
commit 02174a2cff
2 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
java/google/registry/tools/server/KillAllDomainApplicationsAction.java
View file

@ -75,20 +75,34 @@ public class KillAllDomainApplicationsAction implements Runnable {
getContext().incrementCounter("applications already deleted");
return;
}
Key<DomainApplication> applicationKey = Key.create(application);
DomainApplicationIndex dai =
ofy().load().key(DomainApplicationIndex.createKey(application)).now();
EppResourceIndex eri =
ofy().load().entity(EppResourceIndex.create(applicationKey)).now();
if (dai == null || eri == null) {
if (dai == null) {
logger.atSevere().log(
"Missing index(es) for application %s; skipping.", applicationKey);
getContext().incrementCounter("missing indexes");
return;
"Missing domain application index for application %s.", applicationKey);
getContext().incrementCounter("missing domain application indexes");
} else {
ofy().delete().entity(dai);
}
// This case shouldn't be possible except in extremely rare circumstances, as this
// mapreduce itself is relying on EPP resource indexes to load the domain
// applications to delete.
if (eri == null) {
logger.atSevere().log(
"Missing EPP resource index for application %s.", applicationKey);
getContext().incrementCounter("missing EPP resource indexes");
} else {
ofy().delete().entity(eri);
}
// Delete the application, its descendents, and the indexes.
ofy().delete().keys(ofy().load().ancestor(application).keys());
ofy().delete().entities(dai, eri);
logger.atInfo().log("Deleted domain application %s.", applicationKey);
getContext().incrementCounter("applications deleted");
});

23
javatests/google/registry/tools/server/KillAllDomainApplicationsActionTest.java
View file

@ -16,6 +16,7 @@ package google.registry.tools.server;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.DatastoreHelper.createTlds;
import static google.registry.testing.DatastoreHelper.persistActiveContact;
import static google.registry.testing.DatastoreHelper.persistActiveDomain;
@ -91,4 +92,26 @@ public class KillAllDomainApplicationsActionTest
.entities(application, applicationEri, applicationDai, applicationHistoryEntry))
.isEmpty();
}
@Test
public void test_deletesApplication_evenWhenIndexIsMissing() throws Exception {
createTld("tld1");
DomainApplication application = persistActiveDomainApplication("applied.tld1");
EppResourceIndex applicationEri =
ofy().load().entity(EppResourceIndex.create(Key.create(application))).now();
HistoryEntry applicationHistoryEntry =
persistResource(new HistoryEntry.Builder().setParent(application).build());
// Delete the domain application index.
ofy().transact(() -> ofy().delete().key(DomainApplicationIndex.createKey(application)).now());
ofy().clearSessionCache();
runMapreduce();
ofy().clearSessionCache();
// Check that the domain application and history entry were deleted even though the indexes
// couldn't be found.
assertThat(ofy().load().entities(application, applicationEri, applicationHistoryEntry))
.isEmpty();
}
}