You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/01/27 03:43:24 UTC
[iotdb] branch DeleteDeadLock11 created (now cb65be7)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch DeleteDeadLock11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at cb65be7 cherry pick Fix dead lock between deleting data and querying in paralle. (#2558)
This branch includes the following new commits:
new cb65be7 cherry pick Fix dead lock between deleting data and querying in paralle. (#2558)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: cherry pick Fix dead lock between deleting data and
querying in paralle. (#2558)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch DeleteDeadLock11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cb65be70a852617baf46c4a9392f4341d65f93f5
Author: Jackie Tien <Ja...@foxmail.com>
AuthorDate: Sat Jan 23 15:18:49 2021 +0800
cherry pick Fix dead lock between deleting data and querying in paralle. (#2558)
---
.../engine/storagegroup/StorageGroupProcessor.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 201b908..a67666b 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1513,8 +1513,8 @@ public class StorageGroupProcessor {
// TODO: how to avoid partial deletion?
// FIXME: notice that if we may remove a SGProcessor out of memory, we need to close all opened
//mod files in mergingModification, sequenceFileList, and unsequenceFileList
- writeLock();
tsFileManagement.writeLock();
+ writeLock();
// record files which are updated so that we can roll back them in case of exception
List<ModificationFile> updatedModFiles = new ArrayList<>();
@@ -1559,8 +1559,8 @@ public class StorageGroupProcessor {
}
throw new IOException(e);
} finally {
- tsFileManagement.writeUnlock();
writeUnlock();
+ tsFileManagement.writeUnlock();
}
}
@@ -1786,8 +1786,8 @@ public class StorageGroupProcessor {
resource.getEndTime(index))
);
}
- insertLock.writeLock().lock();
tsFileManagement.writeLock();
+ writeLock();
try {
if (tsFileResource.isSeq()) {
tsFileManagement.addAll(upgradedResources, true);
@@ -1797,8 +1797,8 @@ public class StorageGroupProcessor {
upgradeUnseqFileList.remove(tsFileResource);
}
} finally {
+ writeUnlock();
tsFileManagement.writeUnlock();
- insertLock.writeLock().unlock();
}
// after upgrade complete, update partitionLatestFlushedTimeForEachDevice
@@ -1848,8 +1848,8 @@ public class StorageGroupProcessor {
public void loadNewTsFileForSync(TsFileResource newTsFileResource) throws LoadFileException {
File tsfileToBeInserted = newTsFileResource.getTsFile();
long newFilePartitionId = newTsFileResource.getTimePartitionWithCheck();
- writeLock();
tsFileManagement.writeLock();
+ writeLock();
try {
if (loadTsFileByType(LoadTsFileType.LOAD_SEQUENCE, tsfileToBeInserted, newTsFileResource,
newFilePartitionId)) {
@@ -1862,8 +1862,8 @@ public class StorageGroupProcessor {
IoTDBDescriptor.getInstance().getConfig().setReadOnly(true);
throw new LoadFileException(e);
} finally {
- tsFileManagement.writeUnlock();
writeUnlock();
+ tsFileManagement.writeUnlock();
}
}
@@ -1884,8 +1884,8 @@ public class StorageGroupProcessor {
public void loadNewTsFile(TsFileResource newTsFileResource) throws LoadFileException {
File tsfileToBeInserted = newTsFileResource.getTsFile();
long newFilePartitionId = newTsFileResource.getTimePartitionWithCheck();
- writeLock();
tsFileManagement.writeLock();
+ writeLock();
try {
List<TsFileResource> sequenceList = tsFileManagement.getTsFileList(true);
@@ -1929,8 +1929,8 @@ public class StorageGroupProcessor {
IoTDBDescriptor.getInstance().getConfig().setReadOnly(true);
throw new LoadFileException(e);
} finally {
- tsFileManagement.writeUnlock();
writeUnlock();
+ tsFileManagement.writeUnlock();
}
}
@@ -2281,8 +2281,8 @@ public class StorageGroupProcessor {
* @UsedBy sync module, load external tsfile module.
*/
public boolean deleteTsfile(File tsfieToBeDeleted) {
- writeLock();
tsFileManagement.writeLock();
+ writeLock();
TsFileResource tsFileResourceToBeDeleted = null;
try {
Iterator<TsFileResource> sequenceIterator = tsFileManagement.getIterator(true);
@@ -2306,8 +2306,8 @@ public class StorageGroupProcessor {
}
}
} finally {
- tsFileManagement.writeUnlock();
writeUnlock();
+ tsFileManagement.writeUnlock();
}
if (tsFileResourceToBeDeleted == null) {
return false;
@@ -2339,8 +2339,8 @@ public class StorageGroupProcessor {
* @UsedBy load external tsfile module.
*/
public boolean moveTsfile(File fileToBeMoved, File targetDir) {
- writeLock();
tsFileManagement.writeLock();
+ writeLock();
TsFileResource tsFileResourceToBeMoved = null;
try {
Iterator<TsFileResource> sequenceIterator = tsFileManagement.getIterator(true);
@@ -2364,8 +2364,8 @@ public class StorageGroupProcessor {
}
}
} finally {
- tsFileManagement.writeUnlock();
writeUnlock();
+ tsFileManagement.writeUnlock();
}
if (tsFileResourceToBeMoved == null) {
return false;
@@ -2450,8 +2450,8 @@ public class StorageGroupProcessor {
*/
public void removePartitions(TimePartitionFilter filter) {
// this requires blocking all other activities
- insertLock.writeLock().lock();
tsFileManagement.writeLock();
+ insertLock.writeLock().lock();
try {
// abort ongoing merges
MergeManager.getINSTANCE().abortMerge(storageGroupName);