Skip to content

[To dev/1.3] Fix flaky LastFlushTimeMapTest & Fix go client CI for dev/1.3 #14403

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.

Sign up for GitHub

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

Merged
HTHou merged 2 commits into from
Dec 12, 2024
Merged

[To dev/1.3] Fix flaky LastFlushTimeMapTest & Fix go client CI for dev/1.3 #14403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdead38
Fix flaky LastFlushTimeMapTest (#14225)
HTHou Nov 27, 2024
e256c93
fix go client CI for 1.33
HTHou Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/multi-language-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ jobs:
run: |
cd iotdb-client
git clone https://github.com/apache/iotdb-client-go.git
cd iotdb-client-go
cd iotdb-client-go
git checkout rc/1.3.3
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo

python:
Expand Down
1 change: 1 addition & 0 deletions .../src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ public Future<?> asyncClose() {
* TODO if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup Tips: I am
* trying to solve this issue by checking whether the table exist before wait()
*/
@TestOnly
public void syncFlush() throws IOException {
IMemTable tmpMemTable;
flushQueryLock.writeLock().lock();
Expand Down
30 changes: 2 additions & 28 deletions ...e/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@ record = new TSRecord(j, deviceId);
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
dataRegion.insert(buildInsertRowNodeByTSRecord(record));
}

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}
dataRegion.syncCloseWorkingTsFileProcessors(false);

for (int j = 11; j <= 20; j++) {
record = new TSRecord(j, deviceId);
Expand Down Expand Up @@ -655,10 +652,6 @@ public void testDisableSeparateDataForInsertRowPlan()
dataRegion.syncCloseAllWorkingTsFileProcessors();
}

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}

QueryDataSource queryDataSource =
dataRegion.query(
Collections.singletonList(new PartialPath(deviceId, measurementId)),
Expand Down Expand Up @@ -744,10 +737,6 @@ public void testDisableSeparateDataForInsertTablet1()
dataRegion.insertTablet(insertTabletNode2);
dataRegion.syncCloseAllWorkingTsFileProcessors();

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}

QueryDataSource queryDataSource =
dataRegion.query(
Collections.singletonList(new PartialPath(deviceId, measurementId)),
Expand Down Expand Up @@ -832,10 +821,6 @@ public void testDisableSeparateDataForInsertTablet2()
dataRegion.insertTablet(insertTabletNode2);
dataRegion.syncCloseAllWorkingTsFileProcessors();

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}

QueryDataSource queryDataSource =
dataRegion.query(
Collections.singletonList(new PartialPath(deviceId, measurementId)),
Expand Down Expand Up @@ -920,10 +905,6 @@ public void testDisableSeparateDataForInsertTablet3()
dataRegion.insertTablet(insertTabletNode2);
dataRegion.syncCloseAllWorkingTsFileProcessors();

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}

QueryDataSource queryDataSource =
dataRegion.query(
Collections.singletonList(new PartialPath(deviceId, measurementId)),
Expand Down Expand Up @@ -999,11 +980,6 @@ public void testSmallReportProportionInsertRow()
dataRegion1.syncCloseAllWorkingTsFileProcessors();
}
dataRegion1.syncCloseAllWorkingTsFileProcessors();

for (TsFileProcessor tsfileProcessor : dataRegion1.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}

QueryDataSource queryDataSource =
dataRegion1.query(
Collections.singletonList(new PartialPath("root.ln22", measurementId)),
Expand Down Expand Up @@ -1551,9 +1527,7 @@ public void testDeleteDataDirectlyUnseqWriteModsOrDeleteFiles()
dataRegion.insert(buildInsertRowNodeByTSRecord(record));
}

for (TsFileProcessor processor : dataRegion.getWorkSequenceTsFileProcessors()) {
processor.syncFlush();
}
dataRegion.syncCloseWorkingTsFileProcessors(true);
TsFileResource tsFileResourceUnSeq = dataRegion.getTsFileManager().getTsFileList(false).get(0);

Assert.assertTrue(tsFileResourceSeq.getTsFile().exists());
Expand Down
13 changes: 1 addition & 12 deletions ...node/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.iotdb.db.exception.WriteProcessException;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskManager;
import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.DeviceTimeIndex;
import org.apache.iotdb.db.utils.EnvironmentUtils;
Expand Down Expand Up @@ -90,9 +89,7 @@ record = new TSRecord(j, "root.vehicle.d0");
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
}

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}
dataRegion.syncCloseWorkingTsFileProcessors(false);
Assert.assertEquals(
10000,
dataRegion.getLastFlushTimeMap().getFlushedTime(0, new PlainDeviceID("root.vehicle.d0")));
Expand All @@ -116,10 +113,6 @@ record = new TSRecord(j, "root.vehicle.d0");
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
}

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}
dataRegion.syncCloseAllWorkingTsFileProcessors();
Assert.assertEquals(
10000,
Expand Down Expand Up @@ -155,10 +148,6 @@ record = new TSRecord(j, "root.vehicle.d0");
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
}

for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
tsfileProcessor.syncFlush();
}
dataRegion.syncCloseAllWorkingTsFileProcessors();
Assert.assertEquals(
604_800_000,
Expand Down
Loading