Skip to content

Commit 7933ef9

Browse files
authored
[To dev/1.3] Fix flaky LastFlushTimeMapTest & Fix go client CI for dev/1.3 (#14403)
1 parent ffbb28a commit 7933ef9

File tree

4 files changed

+6
-41
lines changed

4 files changed

+6
-41
lines changed

.github/workflows/multi-language-client.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ jobs:
119119
run: |
120120
cd iotdb-client
121121
git clone https://github.com/apache/iotdb-client-go.git
122-
cd iotdb-client-go
122+
cd iotdb-client-go
123+
git checkout rc/1.3.3
123124
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
124125
125126
python:

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,7 @@ public Future<?> asyncClose() {
11701170
* TODO if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup Tips: I am
11711171
* trying to solve this issue by checking whether the table exist before wait()
11721172
*/
1173+
@TestOnly
11731174
public void syncFlush() throws IOException {
11741175
IMemTable tmpMemTable;
11751176
flushQueryLock.writeLock().lock();

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,7 @@ record = new TSRecord(j, deviceId);
178178
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
179179
dataRegion.insert(buildInsertRowNodeByTSRecord(record));
180180
}
181-
182-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
183-
tsfileProcessor.syncFlush();
184-
}
181+
dataRegion.syncCloseWorkingTsFileProcessors(false);
185182

186183
for (int j = 11; j <= 20; j++) {
187184
record = new TSRecord(j, deviceId);
@@ -655,10 +652,6 @@ public void testDisableSeparateDataForInsertRowPlan()
655652
dataRegion.syncCloseAllWorkingTsFileProcessors();
656653
}
657654

658-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
659-
tsfileProcessor.syncFlush();
660-
}
661-
662655
QueryDataSource queryDataSource =
663656
dataRegion.query(
664657
Collections.singletonList(new PartialPath(deviceId, measurementId)),
@@ -744,10 +737,6 @@ public void testDisableSeparateDataForInsertTablet1()
744737
dataRegion.insertTablet(insertTabletNode2);
745738
dataRegion.syncCloseAllWorkingTsFileProcessors();
746739

747-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
748-
tsfileProcessor.syncFlush();
749-
}
750-
751740
QueryDataSource queryDataSource =
752741
dataRegion.query(
753742
Collections.singletonList(new PartialPath(deviceId, measurementId)),
@@ -832,10 +821,6 @@ public void testDisableSeparateDataForInsertTablet2()
832821
dataRegion.insertTablet(insertTabletNode2);
833822
dataRegion.syncCloseAllWorkingTsFileProcessors();
834823

835-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
836-
tsfileProcessor.syncFlush();
837-
}
838-
839824
QueryDataSource queryDataSource =
840825
dataRegion.query(
841826
Collections.singletonList(new PartialPath(deviceId, measurementId)),
@@ -920,10 +905,6 @@ public void testDisableSeparateDataForInsertTablet3()
920905
dataRegion.insertTablet(insertTabletNode2);
921906
dataRegion.syncCloseAllWorkingTsFileProcessors();
922907

923-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
924-
tsfileProcessor.syncFlush();
925-
}
926-
927908
QueryDataSource queryDataSource =
928909
dataRegion.query(
929910
Collections.singletonList(new PartialPath(deviceId, measurementId)),
@@ -999,11 +980,6 @@ public void testSmallReportProportionInsertRow()
999980
dataRegion1.syncCloseAllWorkingTsFileProcessors();
1000981
}
1001982
dataRegion1.syncCloseAllWorkingTsFileProcessors();
1002-
1003-
for (TsFileProcessor tsfileProcessor : dataRegion1.getWorkUnsequenceTsFileProcessors()) {
1004-
tsfileProcessor.syncFlush();
1005-
}
1006-
1007983
QueryDataSource queryDataSource =
1008984
dataRegion1.query(
1009985
Collections.singletonList(new PartialPath("root.ln22", measurementId)),
@@ -1551,9 +1527,7 @@ public void testDeleteDataDirectlyUnseqWriteModsOrDeleteFiles()
15511527
dataRegion.insert(buildInsertRowNodeByTSRecord(record));
15521528
}
15531529

1554-
for (TsFileProcessor processor : dataRegion.getWorkSequenceTsFileProcessors()) {
1555-
processor.syncFlush();
1556-
}
1530+
dataRegion.syncCloseWorkingTsFileProcessors(true);
15571531
TsFileResource tsFileResourceUnSeq = dataRegion.getTsFileManager().getTsFileList(false).get(0);
15581532

15591533
Assert.assertTrue(tsFileResourceSeq.getTsFile().exists());

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/LastFlushTimeMapTest.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.iotdb.db.exception.WriteProcessException;
2626
import org.apache.iotdb.db.storageengine.StorageEngine;
2727
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskManager;
28-
import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
2928
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
3029
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.DeviceTimeIndex;
3130
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -90,9 +89,7 @@ record = new TSRecord(j, "root.vehicle.d0");
9089
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
9190
}
9291

93-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
94-
tsfileProcessor.syncFlush();
95-
}
92+
dataRegion.syncCloseWorkingTsFileProcessors(false);
9693
Assert.assertEquals(
9794
10000,
9895
dataRegion.getLastFlushTimeMap().getFlushedTime(0, new PlainDeviceID("root.vehicle.d0")));
@@ -116,10 +113,6 @@ record = new TSRecord(j, "root.vehicle.d0");
116113
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
117114
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
118115
}
119-
120-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
121-
tsfileProcessor.syncFlush();
122-
}
123116
dataRegion.syncCloseAllWorkingTsFileProcessors();
124117
Assert.assertEquals(
125118
10000,
@@ -155,10 +148,6 @@ record = new TSRecord(j, "root.vehicle.d0");
155148
record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(j)));
156149
dataRegion.insert(DataRegionTest.buildInsertRowNodeByTSRecord(record));
157150
}
158-
159-
for (TsFileProcessor tsfileProcessor : dataRegion.getWorkUnsequenceTsFileProcessors()) {
160-
tsfileProcessor.syncFlush();
161-
}
162151
dataRegion.syncCloseAllWorkingTsFileProcessors();
163152
Assert.assertEquals(
164153
604_800_000,

0 commit comments

Comments
 (0)