-
Notifications
You must be signed in to change notification settings - Fork 207
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix waitForSidecar to respect timeout. (#1146)
* Fix waitForSidecar to respect timeout. Signed-off-by: Artur Souza <[email protected]> * Bring back 500ms interval for retries and log for waitForSidecar Signed-off-by: Artur Souza <[email protected]> * Fix flaky test for ConfigurationClientIT Signed-off-by: Artur Souza <[email protected]> --------- Signed-off-by: Artur Souza <[email protected]>
- Loading branch information
1 parent
b1196d3
commit b683fce
Showing
4 changed files
with
116 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
sdk-tests/src/test/java/io/dapr/it/resiliency/WaitForSidecarIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Copyright 2024 The Dapr Authors | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package io.dapr.it.resiliency; | ||
|
|
||
| import io.dapr.it.BaseIT; | ||
| import io.dapr.it.DaprRun; | ||
| import io.dapr.it.ToxiProxyRun; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| /** | ||
| * Test SDK resiliency. | ||
| */ | ||
| public class WaitForSidecarIT extends BaseIT { | ||
|
|
||
| // Use a number large enough to make sure it will respect the entire timeout. | ||
| private static final Duration LATENCY = Duration.ofSeconds(5); | ||
|
|
||
| private static final Duration JITTER = Duration.ofSeconds(0); | ||
|
|
||
| private static DaprRun daprRun; | ||
|
|
||
| private static ToxiProxyRun toxiProxyRun; | ||
|
|
||
| private static DaprRun daprNotRunning; | ||
|
|
||
| @BeforeAll | ||
| public static void init() throws Exception { | ||
| daprRun = startDaprApp(WaitForSidecarIT.class.getSimpleName(), 5000); | ||
| daprNotRunning = startDaprApp(WaitForSidecarIT.class.getSimpleName()+"NotRunning", 5000); | ||
| daprNotRunning.stop(); | ||
|
|
||
| toxiProxyRun = new ToxiProxyRun(daprRun, LATENCY, JITTER); | ||
| toxiProxyRun.start(); | ||
| } | ||
|
|
||
| @Test | ||
| public void waitSucceeds() throws Exception { | ||
| try(var client = daprRun.newDaprClient()) { | ||
| client.waitForSidecar(5000).block(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void waitTimeout() { | ||
| int timeoutInMillis = (int)LATENCY.minusMillis(100).toMillis(); | ||
| long started = System.currentTimeMillis(); | ||
| assertThrows(RuntimeException.class, () -> { | ||
| try(var client = toxiProxyRun.newDaprClientBuilder().build()) { | ||
| client.waitForSidecar(timeoutInMillis).block(); | ||
| } | ||
| }); | ||
| long duration = System.currentTimeMillis() - started; | ||
| assertTrue(duration >= timeoutInMillis); | ||
| } | ||
|
|
||
| @Test | ||
| public void waitSlow() throws Exception { | ||
| int timeoutInMillis = (int)LATENCY.plusMillis(100).toMillis(); | ||
| long started = System.currentTimeMillis(); | ||
| try(var client = toxiProxyRun.newDaprClientBuilder().build()) { | ||
| client.waitForSidecar(timeoutInMillis).block(); | ||
| } | ||
| long duration = System.currentTimeMillis() - started; | ||
| assertTrue(duration >= LATENCY.toMillis()); | ||
| } | ||
|
|
||
| @Test | ||
| public void waitNotRunningTimeout() { | ||
| // Does not make this number too smaller since bug does not repro when <= 2.5s. | ||
| // This has to do with a previous bug in the implementation. | ||
| int timeoutMilliseconds = 5000; | ||
| long started = System.currentTimeMillis(); | ||
| assertThrows(RuntimeException.class, () -> { | ||
| try(var client = daprNotRunning.newDaprClientBuilder().build()) { | ||
| client.waitForSidecar(timeoutMilliseconds).block(); | ||
| } | ||
| }); | ||
| long duration = System.currentTimeMillis() - started; | ||
| assertTrue(duration >= timeoutMilliseconds); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters