You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by le...@apache.org on 2019/12/28 09:18:18 UTC
[incubator-iotdb] branch rel/0.9 updated: fix null pointer
exception in tsfile recover performer
This is an automated email from the ASF dual-hosted git repository.
leirui pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.9 by this push:
new 66e02ee fix null pointer exception in tsfile recover performer
66e02ee is described below
commit 66e02eec770bbe671a10ea603dfd10b0f44fcf33
Author: lta <li...@163.com>
AuthorDate: Wed Dec 11 14:47:06 2019 +0800
fix null pointer exception in tsfile recover performer
(cherry picked from commit 597da578afe802c44f776a81f4afd8dc35a8de6d)
---
server/src/main/java/org/apache/iotdb/db/service/IoTDB.java | 1 -
.../apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index 5db33ba..0445986 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -120,7 +120,6 @@ public class IoTDB implements IoTDBMBean {
private void initMManager(){
MManager.getInstance().init();
IoTDBConfigDynamicAdapter.getInstance().setInitialized(true);
- logger.debug("After initializing, ");
logger.debug(
"After initializing, max memTable num is {}, tsFile threshold is {}, memtableSize is {}",
IoTDBDescriptor.getInstance().getConfig().getMaxMemtableNumber(),
diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
index 46441e7..148cf73 100644
--- a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
@@ -50,8 +50,7 @@ import org.slf4j.LoggerFactory;
* TsFileRecoverPerformer recovers a SeqTsFile to correct status, redoes the WALs since last crash
* and removes the redone logs.
*/
-public class
-TsFileRecoverPerformer {
+public class TsFileRecoverPerformer {
private static final Logger logger = LoggerFactory.getLogger(TsFileRecoverPerformer.class);
@@ -208,8 +207,7 @@ TsFileRecoverPerformer {
// flush logs
MemTableFlushTask tableFlushTask = new MemTableFlushTask(recoverMemTable, schema,
- restorableTsFileIOWriter,
- logNodePrefix);
+ restorableTsFileIOWriter, tsFileResource.getFile().getParentFile().getName());
tableFlushTask.syncFlushMemTable();
}
// close file