Skip to content

Commit 4b66938

Browse files
authored
[To dev/1.3] Fix potential NPE in Unseq List #16360
1 parent 7d507b7 commit 4b66938

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

  • iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,6 +2093,21 @@ private boolean tryGetFLushLock(
20932093
isDebug)) {
20942094
TsFileProcessor tsFileProcessor = tsFileResource.getProcessor();
20952095
try {
2096+
if (tsFileProcessor == null) {
2097+
// tsFileProcessor == null means this tsfile is being closed, here we try to busy loop
2098+
// until status in TsFileResource has been changed which is supposed to be the last step
2099+
// of closing
2100+
while (!tsFileResource.isClosed() && waitTimeInMs > 0) {
2101+
TimeUnit.MILLISECONDS.sleep(5);
2102+
waitTimeInMs -= 5;
2103+
}
2104+
if (tsFileResource.isClosed()) {
2105+
continue;
2106+
} else {
2107+
clearAlreadyLockedList(needToUnLockList);
2108+
return false;
2109+
}
2110+
}
20962111
long startTime = System.nanoTime();
20972112
if (tsFileProcessor.tryReadLock(waitTimeInMs)) {
20982113
// minus already consumed time

0 commit comments

Comments
 (0)