Reset lastFailedJoinAttempt

elastic · Mar 12, 2019 · 283fdea · 283fdea
1 parent 83f1bb5
commit 283fdea
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinHelper.java b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinHelper.java
@@ -59,6 +59,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.LongSupplier;
@@ -84,7 +85,7 @@ public class JoinHelper {
 
     final Set<Tuple<DiscoveryNode, JoinRequest>> pendingOutgoingJoins = ConcurrentCollections.newConcurrentSet();
 
-    private volatile FailedJoinAttempt lastFailedJoinAttempt;
+    private AtomicReference<FailedJoinAttempt> lastFailedJoinAttempt = new AtomicReference<>();
 
     JoinHelper(Settings settings, AllocationService allocationService, MasterService masterService,
                TransportService transportService, LongSupplier currentTermSupplier, Supplier<ClusterState> currentStateSupplier,
@@ -217,9 +218,10 @@ void logWarnWithTimestamp() {
 
 
     void logLastFailedJoinAttempt() {
-        FailedJoinAttempt attempt = lastFailedJoinAttempt;
+        FailedJoinAttempt attempt = lastFailedJoinAttempt.get();
         if (attempt != null) {
             attempt.logWarnWithTimestamp();
+            lastFailedJoinAttempt.compareAndSet(attempt, null);
         }
     }
 
@@ -241,15 +243,15 @@ public Empty read(StreamInput in) {
                     public void handleResponse(Empty response) {
                         pendingOutgoingJoins.remove(dedupKey);
                         logger.debug("successfully joined {} with {}", destination, joinRequest);
-                        lastFailedJoinAttempt = null;
+                        lastFailedJoinAttempt.set(null);
                     }
 
                     @Override
                     public void handleException(TransportException exp) {
                         pendingOutgoingJoins.remove(dedupKey);
                         FailedJoinAttempt attempt = new FailedJoinAttempt(destination, joinRequest, exp);
                         attempt.logNow();
-                        lastFailedJoinAttempt = attempt;
+                        lastFailedJoinAttempt.set(attempt);
                     }
 
                     @Override