[incubator-iotdb] branch refactor_mem_control updated: fix invalid write when memory usage level is dangerous in BufferWriteProcessor add shutdown hook to report memory usage

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch refactor_mem_control
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/refactor_mem_control by this push:
     new ab651e5  fix invalid write when memory usage level is dangerous in BufferWriteProcessor add shutdown hook to report memory usage
ab651e5 is described below

commit ab651e5b9f2c2eb3e23f1d7f3026e8f95dd93d38
Author: 江天 <jt...@163.com>
AuthorDate: Fri Apr 12 16:40:40 2019 +0800

    fix invalid write when memory usage level is dangerous in BufferWriteProcessor
    add shutdown hook to report memory usage
---
 .../engine/bufferwrite/BufferWriteProcessor.java   | 19 ++++++++----
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  2 ++
 .../apache/iotdb/db/service/IoTDBShutdownHook.java | 35 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
index d819c06..91ace85 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
@@ -171,20 +171,27 @@ public class BufferWriteProcessor extends Processor {
     long memUsage = MemUtils.getRecordSize(tsRecord);
     BasicMemController.UsageLevel level = BasicMemController.getInstance()
         .acquireUsage(this, memUsage);
-    for (DataPoint dataPoint : tsRecord.dataPointList) {
-      workMemTable.write(tsRecord.deviceId, dataPoint.getMeasurementId(), dataPoint.getType(),
-          tsRecord.time,
-          dataPoint.getValue().toString());
-    }
-    valueCount++;
+
     String memory;
     switch (level) {
       case SAFE:
+        for (DataPoint dataPoint : tsRecord.dataPointList) {
+          workMemTable.write(tsRecord.deviceId, dataPoint.getMeasurementId(), dataPoint.getType(),
+              tsRecord.time,
+              dataPoint.getValue().toString());
+        }
+        valueCount++;
         checkMemThreshold4Flush(memUsage);
         return true;
       case WARNING:
         memory = MemUtils.bytesCntToStr(BasicMemController.getInstance().getTotalUsage());
         LOGGER.warn("Memory usage will exceed warning threshold, current : {}.", memory);
+        for (DataPoint dataPoint : tsRecord.dataPointList) {
+          workMemTable.write(tsRecord.deviceId, dataPoint.getMeasurementId(), dataPoint.getType(),
+              tsRecord.time,
+              dataPoint.getValue().toString());
+        }
+        valueCount++;
         checkMemThreshold4Flush(memUsage);
         return true;
       case DANGEROUS:
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index d85f056..6ea138b 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -79,6 +79,8 @@ public class IoTDB implements IoTDBMBean {
 
   private void setUp() throws StartupException {
     LOGGER.info("Setting up IoTDB...");
+
+    Runtime.getRuntime().addShutdownHook(new IoTDBShutdownHook());
     setUncaughtExceptionHandler();
 
     FileNodeManager.getInstance().recovery();
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
new file mode 100644
index 0000000..b333c0e
--- /dev/null
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.service;
+
+import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IoTDBShutdownHook extends Thread{
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBShutdownHook.class);
+
+  @Override
+  public void run() {
+    LOGGER.info("Recorded memory usage: {}, actual jvm memory usage: {}",
+        BasicMemController.getInstance().getTotalUsage(), Runtime.getRuntime().totalMemory() -
+        Runtime.getRuntime().freeMemory());
+  }
+}