This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9eac1fbec44 [Enhancement]use awaitility.await() replace thread.sleep()
#37817 (#38814)
9eac1fbec44 is described below
commit 9eac1fbec44f734fefc26afb643fd80971ff95d7
Author: Vallish Pai <[email protected]>
AuthorDate: Tue Aug 6 04:40:21 2024 +0530
[Enhancement]use awaitility.await() replace thread.sleep() #37817 (#38814)
## Proposed changes
Issue Number: close #xxx
#37817
replace thread.sleep with awaitility util in some of compaction
testcases.
---
.../suites/compaction/test_base_compaction.groovy | 25 +++++++++-------------
.../test_base_compaction_no_value.groovy | 25 +++++++++-------------
.../compaction/test_compaction_agg_keys.groovy | 10 ++++-----
.../compaction/test_compaction_uniq_keys.groovy | 9 ++++----
4 files changed, 29 insertions(+), 40 deletions(-)
diff --git a/regression-test/suites/compaction/test_base_compaction.groovy
b/regression-test/suites/compaction/test_base_compaction.groovy
index 9ec157193ab..83f6b44e611 100644
--- a/regression-test/suites/compaction/test_base_compaction.groovy
+++ b/regression-test/suites/compaction/test_base_compaction.groovy
@@ -16,6 +16,7 @@
// under the License.
import org.codehaus.groovy.runtime.IOGroovyMethods
+import org.awaitility.Awaitility
suite("test_base_compaction", "p2") {
def tableName = "base_compaction_uniq_keys"
@@ -147,9 +148,7 @@ suite("test_base_compaction", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -157,8 +156,8 @@ suite("test_base_compaction", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
streamLoad {
@@ -209,9 +208,7 @@ suite("test_base_compaction", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -219,8 +216,8 @@ suite("test_base_compaction", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
qt_select_default """ SELECT count(*) FROM ${tableName} """
@@ -240,9 +237,7 @@ suite("test_base_compaction", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -250,8 +245,8 @@ suite("test_base_compaction", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
def replicaNum = get_table_replica_num(tableName)
diff --git
a/regression-test/suites/compaction/test_base_compaction_no_value.groovy
b/regression-test/suites/compaction/test_base_compaction_no_value.groovy
index 82bdde174b7..1ed30459521 100644
--- a/regression-test/suites/compaction/test_base_compaction_no_value.groovy
+++ b/regression-test/suites/compaction/test_base_compaction_no_value.groovy
@@ -16,6 +16,7 @@
// under the License.
import org.codehaus.groovy.runtime.IOGroovyMethods
+import org.awaitility.Awaitility
suite("test_base_compaction_no_value", "p2") {
def tableName = "base_compaction_uniq_keys_no_value"
@@ -147,9 +148,7 @@ suite("test_base_compaction_no_value", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -157,8 +156,8 @@ suite("test_base_compaction_no_value", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
streamLoad {
@@ -209,9 +208,7 @@ suite("test_base_compaction_no_value", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -219,8 +216,8 @@ suite("test_base_compaction_no_value", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
qt_select_default """ SELECT count(*) FROM ${tableName} """
@@ -240,9 +237,7 @@ suite("test_base_compaction_no_value", "p2") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -250,8 +245,8 @@ suite("test_base_compaction_no_value", "p2") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
def replicaNum = get_table_replica_num(tableName)
diff --git a/regression-test/suites/compaction/test_compaction_agg_keys.groovy
b/regression-test/suites/compaction/test_compaction_agg_keys.groovy
index 3681b2dcac0..50c79eb7a2e 100644
--- a/regression-test/suites/compaction/test_compaction_agg_keys.groovy
+++ b/regression-test/suites/compaction/test_compaction_agg_keys.groovy
@@ -16,6 +16,7 @@
// under the License.
import org.codehaus.groovy.runtime.IOGroovyMethods
+import org.awaitility.Awaitility
suite("test_compaction_agg_keys") {
def tableName = "compaction_agg_keys_regression_test"
@@ -122,9 +123,7 @@ suite("test_compaction_agg_keys") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -133,8 +132,9 @@ suite("test_compaction_agg_keys") {
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+
+ });
}
def replicaNum = get_table_replica_num(tableName)
diff --git a/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
b/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
index dd8d1dfb7d9..21fd16403ac 100644
--- a/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
+++ b/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
@@ -16,6 +16,7 @@
// under the License.
import org.codehaus.groovy.runtime.IOGroovyMethods
+import org.awaitility.Awaitility
suite("test_compaction_uniq_keys") {
def tableName = "compaction_uniq_keys_regression_test"
@@ -121,9 +122,7 @@ suite("test_compaction_uniq_keys") {
// wait for all compactions done
for (def tablet in tablets) {
- boolean running = true
- do {
- Thread.sleep(1000)
+ Awaitility.await().untilAsserted(() -> {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
(code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
@@ -131,8 +130,8 @@ suite("test_compaction_uniq_keys") {
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
assertEquals("success", compactionStatus.status.toLowerCase())
- running = compactionStatus.run_status
- } while (running)
+ return compactionStatus.run_status;
+ });
}
def replicaNum = get_table_replica_num(tableName)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
