You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/04/08 02:26:47 UTC
[incubator-iotdb] branch master updated: fix concurrent
modification error in upgrade (#1004)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b3f3540 fix concurrent modification error in upgrade (#1004)
b3f3540 is described below
commit b3f3540a6ede0bd863b4130617972137f7c2c2a1
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Wed Apr 8 10:26:38 2020 +0800
fix concurrent modification error in upgrade (#1004)
---
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 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 0ce93bd..0f2a9ef 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
@@ -1292,12 +1292,12 @@ public class StorageGroupProcessor {
*/
public int countUpgradeFiles() {
int cntUpgradeFileNum = 0;
- for (TsFileResource seqTsFileResource : sequenceFileTreeSet) {
+ for (TsFileResource seqTsFileResource : new ArrayList<>(sequenceFileTreeSet)) {
if (UpgradeUtils.isNeedUpgrade(seqTsFileResource)) {
cntUpgradeFileNum += 1;
}
}
- for (TsFileResource unseqTsFileResource : unSequenceFileList) {
+ for (TsFileResource unseqTsFileResource : new ArrayList<>(unSequenceFileList)) {
if (UpgradeUtils.isNeedUpgrade(unseqTsFileResource)) {
cntUpgradeFileNum += 1;
}
@@ -1306,10 +1306,10 @@ public class StorageGroupProcessor {
}
public void upgrade() {
- for (TsFileResource seqTsFileResource : sequenceFileTreeSet) {
+ for (TsFileResource seqTsFileResource : new ArrayList<>(sequenceFileTreeSet)) {
seqTsFileResource.doUpgrade();
}
- for (TsFileResource unseqTsFileResource : unSequenceFileList) {
+ for (TsFileResource unseqTsFileResource : new ArrayList<>(unSequenceFileList)) {
unseqTsFileResource.doUpgrade();
}
}