You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by ro...@apache.org on 2023/02/23 01:54:16 UTC
[incubator-uniffle] branch branch-0.7 updated: [ISSUE-576] Increase the timeout and remove the initialization time (#646)
This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch branch-0.7
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/branch-0.7 by this push:
new 188b0f8e [ISSUE-576] Increase the timeout and remove the initialization time (#646)
188b0f8e is described below
commit 188b0f8e49ed21c0fd50074c2e6b465811ce4506
Author: jokercurry <84...@users.noreply.github.com>
AuthorDate: Thu Feb 23 09:53:22 2023 +0800
[ISSUE-576] Increase the timeout and remove the initialization time (#646)
### What changes were proposed in this pull request?
1、Increase the method execution timeout
2、Don't need to sleep for 2s to initialize, because we have manually closed the `detectStorageScheduler`
### Why are the changes needed?
Fix: #576
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Fix uts.
---
.../strategy/storage/AppBalanceSelectStorageStrategyTest.java | 4 +---
.../strategy/storage/LowestIOSampleCostSelectStorageStrategyTest.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/AppBalanceSelectStorageStrategyTest.java b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/AppBalanceSelectStorageStrategyTest.java
index e30ef2e6..bb7da455 100644
--- a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/AppBalanceSelectStorageStrategyTest.java
+++ b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/AppBalanceSelectStorageStrategyTest.java
@@ -127,7 +127,7 @@ public class AppBalanceSelectStorageStrategyTest {
}
@Test
- @Timeout(20)
+ @Timeout(30)
public void storageCounterMulThreadTest() throws Exception {
String remoteStoragePath = remotePath1 + Constants.COMMA_SPLIT_CHAR + remotePath2
+ Constants.COMMA_SPLIT_CHAR + remotePath3;
@@ -135,8 +135,6 @@ public class AppBalanceSelectStorageStrategyTest {
applicationManager.getSelectStorageStrategy().detectStorage();
CountDownLatch cdl = new CountDownLatch(3);
String testApp1 = "application_testAppId";
- // init detectStorageScheduler
- Thread.sleep(2000);
Thread pickThread1 = new Thread(() -> {
for (int i = 0; i < 1000; i++) {
String appId = testApp1 + i;
diff --git a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/LowestIOSampleCostSelectStorageStrategyTest.java b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/LowestIOSampleCostSelectStorageStrategyTest.java
index 0a383b1c..51fa9189 100644
--- a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/LowestIOSampleCostSelectStorageStrategyTest.java
+++ b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/storage/LowestIOSampleCostSelectStorageStrategyTest.java
@@ -144,7 +144,7 @@ public class LowestIOSampleCostSelectStorageStrategyTest {
}
@Test
- @Timeout(20)
+ @Timeout(30)
public void selectStorageMulThreadTest() throws Exception {
String remoteStoragePath = remoteStorage1 + Constants.COMMA_SPLIT_CHAR + remoteStorage2
+ Constants.COMMA_SPLIT_CHAR + remoteStorage3;
@@ -152,8 +152,6 @@ public class LowestIOSampleCostSelectStorageStrategyTest {
applicationManager.getSelectStorageStrategy().detectStorage();
CountDownLatch cdl = new CountDownLatch(3);
String testApp1 = "application_testAppId";
- // init detectStorageScheduler
- Thread.sleep(2000);
Thread pickThread1 = new Thread(() -> {
for (int i = 0; i < 1000; i++) {
String appId = testApp1 + i;