Repository navigation
[Test] Fix dynamic status queries and asynchronous deletion polling #18899
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Caideyipi
wants to merge
6
commits into
apache:master
Choose a base branch
from
Caideyipi:fix/table-drop-progress-single-node
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
329867e
[Test] Query drop table procedure progress on a single DataNode
Caideyipi ff12d5d
[Test] Fix other dynamic status queries and pipe deletion polling
Caideyipi 743d85b
[Test] Retry database cleanup after asynchronous table drop
Caideyipi 877c016
[Test] Fix remaining drop table waits and continuous assertions
Caideyipi f15d245
[Test] Synchronize table drops and fix review feedback
Caideyipi 3b565d1
[Test] Check all tree pipe auto-drop polling response statuses
Caideyipi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
129 changes: 129 additions & 0 deletions
129
integration-test/src/test/java/org/apache/iotdb/db/it/utils/IoTDBTestUtilsIT.java
This file contains hidden or 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,129 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.iotdb.db.it.utils; | ||
|
|
||
| import org.apache.iotdb.it.env.EnvFactory; | ||
| import org.apache.iotdb.it.framework.IoTDBTestRunner; | ||
| import org.apache.iotdb.itbase.category.TableClusterIT; | ||
| import org.apache.iotdb.itbase.category.TableLocalStandaloneIT; | ||
| import org.apache.iotdb.itbase.env.BaseEnv; | ||
|
|
||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertThrows; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.junit.Assert.fail; | ||
|
|
||
| @RunWith(IoTDBTestRunner.class) | ||
| @Category({TableLocalStandaloneIT.class, TableClusterIT.class}) | ||
| public class IoTDBTestUtilsIT { | ||
|
|
||
| @BeforeClass | ||
| public static void setUp() throws Exception { | ||
| EnvFactory.getEnv().initClusterEnvironment(); | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void tearDown() { | ||
| EnvFactory.getEnv().cleanClusterEnvironment(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAssertAlwaysFail() { | ||
| assertObservationPeriod( | ||
| () -> | ||
| TestUtils.assertAlwaysFail( | ||
| EnvFactory.getEnv(), "select * from missing_database.missing_table", 1)); | ||
| assertThrows( | ||
| AssertionError.class, | ||
| () -> TestUtils.assertAlwaysFail(EnvFactory.getEnv(), "show databases", 1)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAssertDataAlwaysFailsOnMismatch() { | ||
| final BaseEnv env = EnvFactory.getEnv(); | ||
| final AtomicInteger failures = new AtomicInteger(); | ||
| final Consumer<String> handleFailure = message -> failures.incrementAndGet(); | ||
| assertThrows( | ||
| AssertionError.class, | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, "count databases", "unexpected,", Collections.emptySet(), 1, (String) null)); | ||
| assertThrows( | ||
| AssertionError.class, | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, "count databases", "unexpected,", Collections.emptySet(), 1, handleFailure)); | ||
| assertThrows( | ||
| AssertionError.class, | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, | ||
| "show databases", | ||
| "unexpected,", | ||
| Collections.emptySet(), | ||
| 1, | ||
| "information_schema", | ||
| handleFailure)); | ||
| assertEquals(2, failures.get()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAssertDataAlwaysObservationPeriod() { | ||
| final BaseEnv env = EnvFactory.getEnv(); | ||
| final Consumer<String> handleFailure = message -> fail(message); | ||
| assertObservationPeriod( | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, "count databases", "count,", Collections.singleton("0,"), 1, (String) null)); | ||
| assertObservationPeriod( | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, "count databases", "count,", Collections.singleton("0,"), 1, handleFailure)); | ||
| assertObservationPeriod( | ||
| () -> | ||
| TestUtils.assertDataAlwaysOnEnv( | ||
| env, | ||
| "count databases", | ||
| "count,", | ||
| Collections.singleton("1,"), | ||
| 1, | ||
| "information_schema", | ||
| handleFailure)); | ||
| } | ||
|
|
||
| private void assertObservationPeriod(final Runnable assertion) { | ||
| final long start = System.nanoTime(); | ||
| assertion.run(); | ||
| assertTrue( | ||
| "The assertion must observe queries for the requested period", | ||
| System.nanoTime() - start >= TimeUnit.SECONDS.toNanos(1)); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[P1] Fix the remaining lifecycle expectations when enabling continuous assertions
This terminal await also activates the previously dormant checks in
IoTDBPipeLifeCycleIT.testLifeCycleWithHistoryDisabled, but that caller has not been updated. AfterstopPipe("p1"),root.ln0is created only on the sender, while the receiver retains the two existing series underroot.db. The receiver's series count underroot.ln0, series count underroot.db, and database count forroot.ln0should therefore be0,2, and0; the assertions at lines 227–238 still expect1for all three.I reproduced the failure from a clean reactor build with
MultiClusterITand two 1-ConfigNode/3-DataNode clusters: the first incorrect assertion fails atIoTDBPipeLifeCycleIT.java:227, with actual0versus expected1. Please update all three expectations together with this helper change so the existing tree-model pipe test remains runnable.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applied in f15d245. The lifecycle assertions now expect 0 series under root.ln0, 2 under root.db, and 0 databases under root.ln0. Verified testLifeCycleWithHistoryDisabled with two 1-ConfigNode/3-DataNode clusters and the original observation periods; it passed. The local run used 32 MiB initial node heaps, Serial GC, and ActiveProcessorCount=2 to fit available memory; maximum node heaps and cluster topology were unchanged.