From 247267a03b5bf3bef46ba1b97f7263a26931b9a5 Mon Sep 17 00:00:00 2001 From: gbrodman Date: Tue, 16 Nov 2021 11:37:20 -0500 Subject: [PATCH] Release the replay lock in SQL, not Datastore (#1422) * Release the replay lock in SQL, not Datastore It's always acquired in SQL, so it should always be released in SQL. --- .../google/registry/backup/ReplayCommitLogsToSqlAction.java | 2 +- .../registry/model/replay/ReplicateToDatastoreAction.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java b/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java index c35d8d9dd..2bfcda1af 100644 --- a/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java +++ b/core/src/main/java/google/registry/backup/ReplayCommitLogsToSqlAction.java @@ -140,7 +140,7 @@ public class ReplayCommitLogsToSqlAction implements Runnable { response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); response.setPayload(message); } finally { - lock.ifPresent(Lock::release); + lock.ifPresent(Lock::releaseSql); } } diff --git a/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java b/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java index 630a168c8..1c513f4df 100644 --- a/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java +++ b/core/src/main/java/google/registry/model/replay/ReplicateToDatastoreAction.java @@ -194,7 +194,7 @@ public class ReplicateToDatastoreAction implements Runnable { response.setStatus(SC_INTERNAL_SERVER_ERROR); response.setPayload(message); } finally { - lock.ifPresent(Lock::release); + lock.ifPresent(Lock::releaseSql); } }