From ccbe0ed3a031fa98bf17051b7e132d54549673e3 Mon Sep 17 00:00:00 2001
From: Artem Vysochyn <artem.vysochyn@gmail.com>
Date: Sat, 2 Sep 2023 13:00:24 +0300
Subject: [PATCH] Refactored
 io.scalecube.cluster.membership.MembershipProtocolImpl.send

---
 .../membership/MembershipProtocolImpl.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java b/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
index ad48b383..e7d8707a 100644
--- a/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
+++ b/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
@@ -37,6 +37,7 @@
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -349,7 +350,7 @@ private void doSync() {
 
     Message message = prepareSyncDataMsg(SYNC, null);
     LOGGER.debug("[{}][doSync] Send Sync to {}", localMember, addresses);
-    send(transport, addresses, 0, message)
+    send(transport, addresses, message)
         .subscribe(
             null,
             ex ->
@@ -890,14 +891,14 @@ private Mono<Void> spreadMembershipGossip(MembershipRecord record) {
         });
   }
 
-  private static Mono<Void> send(
-      Transport transport, List<Address> addresses, int currentIndex, Message request) {
-    if (currentIndex >= addresses.size()) {
-      return Mono.error(new RuntimeException("All addresses have been tried and failed"));
-    }
-
-    return transport
-        .send(addresses.get(currentIndex), request)
-        .onErrorResume(th -> send(transport, addresses, currentIndex + 1, request));
+  private static Mono<Void> send(Transport transport, List<Address> addresses, Message request) {
+    final AtomicInteger currentIndex = new AtomicInteger();
+    return Mono.defer(
+            () -> {
+              final Address address = addresses.get(currentIndex.get());
+              return transport.send(address, request);
+            })
+        .doOnError(ex -> currentIndex.incrementAndGet())
+        .retry(addresses.size() - 1);
   }
 }