From 97c2049669caf8da098b18036938d04bee64e07f Mon Sep 17 00:00:00 2001 From: mcilwain Date: Thu, 24 Jan 2019 09:40:36 -0800 Subject: [PATCH] Catch errors when attempting to delete entities through Objectify This is currently erroring out on entities that fail to load properly through Objectify (e.g. because their entity type is no longer registered). The proper thing to do is to catch the error, log it, and fall back to the raw Datastore operation, which will succeed. The exact Exception this is designed to catch is: com.google.apphosting.runtime.jetty9.JettyLogger warn: /_dr/admin/deleteEntity (JettyLogger.java:29) java.lang.IllegalStateException: No registered subclass for discriminator 'DomainApplication' at com.googlecode.objectify.v4.impl.PolymorphicEntityMetadata.getConcrete(PolymorphicEntityMetadata.java:133) at com.googlecode.objectify.v4.impl.PolymorphicEntityMetadata.load(PolymorphicEntityMetadata.java:164) at com.googlecode.objectify.v4.impl.LoadEngine.load(LoadEngine.java:220) at com.googlecode.objectify.v4.impl.LoadEngine$1.nowUncached(LoadEngine.java:178) at com.googlecode.objectify.v4.impl.LoadEngine$1.nowUncached(LoadEngine.java:164) at com.googlecode.objectify.v4.util.ResultCache.now(ResultCache.java:30) at com.googlecode.objectify.v4.impl.Round$1.nowUncached(Round.java:73) at com.googlecode.objectify.v4.util.ResultCache.now(ResultCache.java:30) at com.googlecode.objectify.v4.LoadResult.now(LoadResult.java:25) at google.registry.tools.server.DeleteEntityAction.loadOfyEntity(DeleteEntityAction.java:103) at google.registry.tools.server.DeleteEntityAction.run(DeleteEntityAction.java:74) ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=230737553 --- .../registry/tools/server/DeleteEntityAction.java | 11 +++++++++-- .../registry/tools/server/DeleteEntityActionTest.java | 11 +++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java index 2491f951f..cdcca8276 100644 --- a/java/google/registry/tools/server/DeleteEntityAction.java +++ b/java/google/registry/tools/server/DeleteEntityAction.java @@ -99,8 +99,15 @@ public class DeleteEntityAction implements Runnable { } private Optional loadOfyEntity(Key rawKey) { - EntityMetadata metadata = ofy().factory().getMetadata(rawKey.getKind()); - return Optional.ofNullable(metadata == null ? null : ofy().load().key(create(rawKey)).now()); + try { + EntityMetadata metadata = ofy().factory().getMetadata(rawKey.getKind()); + return Optional.ofNullable(metadata == null ? null : ofy().load().key(create(rawKey)).now()); + } catch (Throwable e) { + logger.atWarning().withCause(e).log( + "Could not load entity with key %s using Objectify; falling back to raw Datastore.", + rawKey); + return Optional.empty(); + } } private Optional loadRawEntity(Key rawKey) { diff --git a/javatests/google/registry/tools/server/DeleteEntityActionTest.java b/javatests/google/registry/tools/server/DeleteEntityActionTest.java index a1626a600..ac53ff4ab 100644 --- a/javatests/google/registry/tools/server/DeleteEntityActionTest.java +++ b/javatests/google/registry/tools/server/DeleteEntityActionTest.java @@ -66,6 +66,17 @@ public class DeleteEntityActionTest { .isEqualTo("Deleted 0 raw entities and 1 registered entities"); } + @Test + public void test_deletePolymorphicEntity_fallbackSucceedsForUnregisteredType() { + Entity entity = new Entity("single", "raw"); + entity.setIndexedProperty("^d", "UnregType"); + getDatastoreService().put(entity); + action.rawKeys = KeyFactory.keyToString(entity.getKey()); + action.run(); + assertThat(response.getPayload()) + .isEqualTo("Deleted 1 raw entities and 0 registered entities"); + } + @Test public void test_deleteOneRawEntityAndOneRegisteredEntitySuccessfully() { Entity entity = new Entity("first", "raw");