From ed7033d1a4459e5f39da96e64f5d180bd93a6044 Mon Sep 17 00:00:00 2001
From: Steve Gury <sgury@netflix.com>
Date: Wed, 22 Jun 2016 17:36:09 -0700
Subject: [PATCH 1/2] Disable Backup-Request / Retries.

**Problem**
There are bugs related to Backup-Request/Retries subscription.
The remaining part of the code is ok.

**Solution**
Disable the code in the ClientBuilder.
---
 .../reactivesocket/client/ClientBuilder.java  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java b/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
index 600c6cf9a..92a2a63f9 100644
--- a/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
+++ b/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
@@ -104,16 +104,17 @@ public ClientBuilder withConnectTimeout(long timeout, TimeUnit unit) {
     }
 
     public ClientBuilder withBackupRequest(double quantile) {
-        return new ClientBuilder(
-            name,
-            executor,
-            requestTimeout, requestTimeoutUnit,
-            connectTimeout, connectTimeoutUnit,
-            quantile,
-            retries, retryThisException,
-            connector,
-            source
-        );
+        throw new IllegalArgumentException("BackupRequest is experimental/disabled.");
+//        return new ClientBuilder(
+//            name,
+//            executor,
+//            requestTimeout, requestTimeoutUnit,
+//            connectTimeout, connectTimeoutUnit,
+//            quantile,
+//            retries, retryThisException,
+//            connector,
+//            source
+//        );
     }
 
     public ClientBuilder withExecutor(ScheduledExecutorService executor) {
@@ -156,16 +157,17 @@ public ClientBuilder withSource(Publisher<List<SocketAddress>> source) {
     }
 
     public ClientBuilder withRetries(int nbOfRetries, Function<Throwable, Boolean> retryThisException) {
-        return new ClientBuilder(
-            name,
-            executor,
-            requestTimeout, requestTimeoutUnit,
-            connectTimeout, connectTimeoutUnit,
-            backupQuantile,
-            nbOfRetries, retryThisException,
-            connector,
-            source
-        );
+        throw new IllegalArgumentException("Retries is experimental/disabled.");
+//        return new ClientBuilder(
+//            name,
+//            executor,
+//            requestTimeout, requestTimeoutUnit,
+//            connectTimeout, connectTimeoutUnit,
+//            backupQuantile,
+//            nbOfRetries, retryThisException,
+//            connector,
+//            source
+//        );
     }
 
     public ReactiveSocket build() {
@@ -184,12 +186,12 @@ public ReactiveSocket build() {
             sourceToFactory(source, filterConnector);
 
         ReactiveSocket socket = new LoadBalancer(factories);
-        if (0.0 < backupQuantile && backupQuantile < 1.0) {
-            socket = new BackupRequestSocket(socket, backupQuantile, executor);
-        }
-        if (retries > 0) {
-            socket = new RetrySocket(socket, retries, t -> true);
-        }
+//        if (0.0 < backupQuantile && backupQuantile < 1.0) {
+//            socket = new BackupRequestSocket(socket, backupQuantile, executor);
+//        }
+//        if (retries > 0) {
+//            socket = new RetrySocket(socket, retries, t -> true);
+//        }
         return socket;
     }
 

From 98efa01bf578cacc5f66f1a24edff7f30f50350c Mon Sep 17 00:00:00 2001
From: Steve Gury <sgury@netflix.com>
Date: Wed, 22 Jun 2016 20:49:15 -0700
Subject: [PATCH 2/2] Address comments

---
 .../reactivesocket/client/ClientBuilder.java  | 37 +------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java b/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
index 92a2a63f9..2a5bb708c 100644
--- a/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
+++ b/reactivesocket-client/src/main/java/io/reactivesocket/client/ClientBuilder.java
@@ -103,20 +103,6 @@ public ClientBuilder withConnectTimeout(long timeout, TimeUnit unit) {
         );
     }
 
-    public ClientBuilder withBackupRequest(double quantile) {
-        throw new IllegalArgumentException("BackupRequest is experimental/disabled.");
-//        return new ClientBuilder(
-//            name,
-//            executor,
-//            requestTimeout, requestTimeoutUnit,
-//            connectTimeout, connectTimeoutUnit,
-//            quantile,
-//            retries, retryThisException,
-//            connector,
-//            source
-//        );
-    }
-
     public ClientBuilder withExecutor(ScheduledExecutorService executor) {
         return new ClientBuilder(
             name,
@@ -156,20 +142,6 @@ public ClientBuilder withSource(Publisher<List<SocketAddress>> source) {
         );
     }
 
-    public ClientBuilder withRetries(int nbOfRetries, Function<Throwable, Boolean> retryThisException) {
-        throw new IllegalArgumentException("Retries is experimental/disabled.");
-//        return new ClientBuilder(
-//            name,
-//            executor,
-//            requestTimeout, requestTimeoutUnit,
-//            connectTimeout, connectTimeoutUnit,
-//            backupQuantile,
-//            nbOfRetries, retryThisException,
-//            connector,
-//            source
-//        );
-    }
-
     public ReactiveSocket build() {
         if (source == null) {
             throw new IllegalStateException("Please configure the source!");
@@ -185,14 +157,7 @@ public ReactiveSocket build() {
         Publisher<List<ReactiveSocketFactory<SocketAddress>>> factories =
             sourceToFactory(source, filterConnector);
 
-        ReactiveSocket socket = new LoadBalancer(factories);
-//        if (0.0 < backupQuantile && backupQuantile < 1.0) {
-//            socket = new BackupRequestSocket(socket, backupQuantile, executor);
-//        }
-//        if (retries > 0) {
-//            socket = new RetrySocket(socket, retries, t -> true);
-//        }
-        return socket;
+        return new LoadBalancer(factories);
     }
 
     private Publisher<List<ReactiveSocketFactory<SocketAddress>>> sourceToFactory(