From 3cc44259da5647f2833b7f19dab03b54fe8367be Mon Sep 17 00:00:00 2001
From: guyben <guyben@google.com>
Date: Fri, 15 Sep 2017 13:45:00 -0700
Subject: [PATCH] Use different locks for thin and full rde reports

The lock is used to prevent dual writing of the same output file, and to
prevent us from generating the same data twice (if RdeStaging was run twice).

However, at times when we're creating both RDE and BRDA reports - we use the
same lock for both even though they write to different files and create
different reports.

This causes one of the two to almost always fail (when both are created, which
is once a week I think) delaying that report by several hours.

Note that the "prefix" part of the filenames has the mode in it, so different
modes will not have the same files.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168882007
---
 java/google/registry/rde/RdeStagingReducer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/google/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java
index 3bda382f9..0f963594c 100644
--- a/java/google/registry/rde/RdeStagingReducer.java
+++ b/java/google/registry/rde/RdeStagingReducer.java
@@ -107,7 +107,7 @@ public final class RdeStagingReducer extends Reducer<PendingDeposit, DepositFrag
         reduceWithLock(key, fragments);
         return null;
       }};
-    String lockName = String.format("RdeStaging %s", key.tld());
+    String lockName = String.format("RdeStaging %s %s", key.tld(), key.mode());
     if (!lockHandler.executeWithLocks(lockRunner, null, lockTimeout, lockName)) {
       logger.warningfmt("Lock in use: %s", lockName);
     }