From 667c74621265c3719508ffaa1e93d7e432ead364 Mon Sep 17 00:00:00 2001 From: Steve Gury Date: Wed, 22 Jun 2016 22:45:38 -0700 Subject: [PATCH] Disable Backup-Request / Retries. (#102) * 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. * Address comments --- .../reactivesocket/client/ClientBuilder.java | 35 +------------------ 1 file changed, 1 insertion(+), 34 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..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,19 +103,6 @@ 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 - ); - } - public ClientBuilder withExecutor(ScheduledExecutorService executor) { return new ClientBuilder( name, @@ -155,19 +142,6 @@ public ClientBuilder withSource(Publisher> source) { ); } - public ClientBuilder withRetries(int nbOfRetries, Function retryThisException) { - 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!"); @@ -183,14 +157,7 @@ public ReactiveSocket build() { Publisher>> 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>> sourceToFactory(