SCBC-492: getAllReplicas and lookupInAllReplicas now require timeouts

programmatix · programmatix · commit 11483fe44d00 · 2025-09-03T09:17:11.000Z
Fixing a 3.9.0 regression. Change-Id: Ia0af4b53b061b5d32330183fbc012aff8545a327 Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/232106 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: David Nault <david.nault@couchbase.com>
diff --git a/scala-client/src/main/scala-2/com/couchbase/client/scala/AsyncCollection.scala b/scala-client/src/main/scala-2/com/couchbase/client/scala/AsyncCollection.scala
@@ -500,7 +500,8 @@ class AsyncCollection(
 
     import scala.jdk.CollectionConverters._
 
-    val results = scala.concurrent.Await.result(futureList, options.timeout)
+    val awaitTimeout = if (options.timeout == Duration.MinusInf) kvReadTimeout else options.timeout
+    val results      = scala.concurrent.Await.result(futureList, awaitTimeout)
     results.asScala.toSeq.map(res =>
       Future.successful(convertReplica(res, environment, options.transcoder))
     )
@@ -600,7 +601,8 @@ class AsyncCollection(
 
     import scala.jdk.CollectionConverters._
 
-    val results = scala.concurrent.Await.result(futureList, options.timeout)
+    val awaitTimeout = if (options.timeout == Duration.MinusInf) kvReadTimeout else options.timeout
+    val results      = scala.concurrent.Await.result(futureList, awaitTimeout)
     results.asScala.toSeq.map(res => Future.successful(convertLookupInReplica(res, environment)))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,8 @@ class AsyncCollection(`
`500`	`500`
`501`	`501`	`import scala.jdk.CollectionConverters._`
`502`	`502`
`503`		`- val results = scala.concurrent.Await.result(futureList, options.timeout)`
	`503`	`+ val awaitTimeout = if (options.timeout == Duration.MinusInf) kvReadTimeout else options.timeout`
	`504`	`+ val results = scala.concurrent.Await.result(futureList, awaitTimeout)`
`504`	`505`	`results.asScala.toSeq.map(res =>`
`505`	`506`	`Future.successful(convertReplica(res, environment, options.transcoder))`
`506`	`507`	`)`
`@@ -600,7 +601,8 @@ class AsyncCollection(`
`600`	`601`
`601`	`602`	`import scala.jdk.CollectionConverters._`
`602`	`603`
`603`		`- val results = scala.concurrent.Await.result(futureList, options.timeout)`
	`604`	`+ val awaitTimeout = if (options.timeout == Duration.MinusInf) kvReadTimeout else options.timeout`
	`605`	`+ val results = scala.concurrent.Await.result(futureList, awaitTimeout)`
`604`	`606`	`results.asScala.toSeq.map(res => Future.successful(convertLookupInReplica(res, environment)))`
`605`	`607`	`}`
`606`	`608`