Skip to content

Commit 94b57b2

Browse files
committed
Fix regression in 190777d that caused bucket.waitUntilReady
to time out for bucket types that do not support views (magma, ephemeral, and memcached). Change-Id: If5fa0d5539b736799b42b9c4ee9d3d8a675ea74c Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/220049 Tested-by: Build Bot <[email protected]> Reviewed-by: Matt Ingenthron <[email protected]>
1 parent 965b0e8 commit 94b57b2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

core-io/src/main/java/com/couchbase/client/core/diagnostics/HealthPinger.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.couchbase.client.core.msg.kv.KvPingResponse;
3131
import com.couchbase.client.core.retry.RetryStrategy;
3232
import com.couchbase.client.core.service.ServiceType;
33+
import com.couchbase.client.core.topology.BucketCapability;
3334
import com.couchbase.client.core.topology.ClusterTopology;
3435
import com.couchbase.client.core.topology.ClusterTopologyWithBucket;
3536
import com.couchbase.client.core.topology.HostAndServicePorts;
@@ -155,7 +156,11 @@ static Set<RequestTarget> extractPingTargets(
155156

156157
final List<ClusterTopology> topologiesToScan = new ArrayList<>();
157158
if (bucket != null) {
158-
topologiesToScan.add(clusterConfig.bucketTopology(bucket));
159+
ClusterTopologyWithBucket topology = clusterConfig.bucketTopology(bucket);
160+
if (topology != null && !topology.bucket().hasCapability(BucketCapability.COUCHAPI)) {
161+
serviceTypeFilter.remove(VIEWS);
162+
}
163+
topologiesToScan.add(topology);
159164
} else {
160165
serviceTypeFilter.removeAll(servicesThatRequireBucket); // narrow to the ones that can be pinged without a bucket
161166
topologiesToScan.add(clusterConfig.globalTopology());

0 commit comments

Comments
 (0)