Lift synchronized

jasontedor · Feb 5, 2019 · fb01037 · fb01037
1 parent c6f8af7
commit fb01037
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/seqno/ReplicationTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/ReplicationTracker.java
@@ -194,30 +194,26 @@ public RetentionLeases getRetentionLeases() {
      *
      * @return a tuple indicating whether or not any retention leases were expired, and the non-expired retention leases
      */
-    public Tuple<Boolean, RetentionLeases> getRetentionLeases(final boolean expireLeases) {
-        final RetentionLeases nonExpiredRetentionLeases;
-        synchronized (this) {
-            if (expireLeases == false) {
-                return Tuple.tuple(false, retentionLeases);
-            }
-            assert primaryMode;
-            // the primary calculates the non-expired retention leases and syncs them to replicas
-            final long currentTimeMillis = currentTimeMillisSupplier.getAsLong();
-            final long retentionLeaseMillis = indexSettings.getRetentionLeaseMillis();
-            final Map<Boolean, List<RetentionLease>> partitionByExpiration = retentionLeases
-                    .leases()
-                    .stream()
-                    .collect(Collectors.groupingBy(lease -> currentTimeMillis - lease.timestamp() > retentionLeaseMillis));
-            if (partitionByExpiration.get(true) == null) {
-                // early out as no retention leases have expired
-                return Tuple.tuple(false, retentionLeases);
-            }
-            final Collection<RetentionLease> nonExpiredLeases =
-                    partitionByExpiration.get(false) != null ? partitionByExpiration.get(false) : Collections.emptyList();
-            retentionLeases = new RetentionLeases(operationPrimaryTerm, retentionLeases.version() + 1, nonExpiredLeases);
-            nonExpiredRetentionLeases = retentionLeases;
+    public synchronized Tuple<Boolean, RetentionLeases> getRetentionLeases(final boolean expireLeases) {
+        if (expireLeases == false) {
+            return Tuple.tuple(false, retentionLeases);
+        }
+        assert primaryMode;
+        // the primary calculates the non-expired retention leases and syncs them to replicas
+        final long currentTimeMillis = currentTimeMillisSupplier.getAsLong();
+        final long retentionLeaseMillis = indexSettings.getRetentionLeaseMillis();
+        final Map<Boolean, List<RetentionLease>> partitionByExpiration = retentionLeases
+                .leases()
+                .stream()
+                .collect(Collectors.groupingBy(lease -> currentTimeMillis - lease.timestamp() > retentionLeaseMillis));
+        if (partitionByExpiration.get(true) == null) {
+            // early out as no retention leases have expired
+            return Tuple.tuple(false, retentionLeases);
         }
-        return Tuple.tuple(true, nonExpiredRetentionLeases);
+        final Collection<RetentionLease> nonExpiredLeases =
+                partitionByExpiration.get(false) != null ? partitionByExpiration.get(false) : Collections.emptyList();
+        retentionLeases = new RetentionLeases(operationPrimaryTerm, retentionLeases.version() + 1, nonExpiredLeases);
+        return Tuple.tuple(true, retentionLeases);
     }
 
     /**