You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/11/02 12:10:11 UTC
[iotdb] branch ZYBug updated: more log
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ZYBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ZYBug by this push:
new 913b1b6 more log
913b1b6 is described below
commit 913b1b6f4efd79482242d6ba8e9aaba246aeea01
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Mon Nov 2 20:06:43 2020 +0800
more log
---
server/src/assembly/resources/conf/iotdb-env.sh | 6 +++---
server/src/assembly/resources/conf/logback.xml | 21 +++++++++++++++++++++
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 ++
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-env.sh b/server/src/assembly/resources/conf/iotdb-env.sh
index c626dfc..0c8c645 100755
--- a/server/src/assembly/resources/conf/iotdb-env.sh
+++ b/server/src/assembly/resources/conf/iotdb-env.sh
@@ -166,9 +166,9 @@ calculate_heap_sizes
#HEAP_NEWSIZE="`expr $system_memory_in_mb \* $min_percentage / 100`M"
# Maximum heap size
-MAX_HEAP_SIZE="32G"
+# MAX_HEAP_SIZE="2G"
# Minimum heap size
-HEAP_NEWSIZE="32G"
+# HEAP_NEWSIZE="2G"
#true or false
#DO NOT FORGET TO MODIFY THE PASSWORD FOR SECURITY (${IOTDB_CONF}/jmx.password and ${IOTDB_CONF}/jmx.access)
@@ -178,7 +178,7 @@ JMX_PORT="31999"
#only take effect when the jmx_local=false
#You need to change this IP as a public IP if you want to remotely connect IoTDB by JMX.
# 0.0.0.0 is not allowed
-JMX_IP="10.159.170.81"
+# JMX_IP="10.159.170.81"
if [ ${JMX_LOCAL} = "false" ]; then
echo "setting remote JMX..."
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml
index 1499a4b..e510fef 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -204,6 +204,24 @@
<level>INFO</level>
</filter>
</appender>
+ <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ALL_SQL">
+ <file>${IOTDB_HOME}/logs/log_all_sql.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${IOTDB_HOME}/logs/log-all-sql-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>50MB</maxFileSize>
+ <maxBackupIndex>50</maxBackupIndex>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <append>true</append>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ </appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY-FREQUENCY">
<file>${IOTDB_HOME}/logs/log_query_frequency.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -245,4 +263,7 @@
<logger level="info" name="QUERY-FREQUENCY">
<appender-ref ref="QUERY-FREQUENCY"/>
</logger>
+ <logger level="info" name="ALL-SQL">
+ <appender-ref ref="ALL_SQL"/>
+ </logger>
</configuration>
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 026b294..2e03a28 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -137,6 +137,7 @@ import org.slf4j.LoggerFactory;
public class TSServiceImpl implements TSIService.Iface, ServerContext {
private static final Logger logger = LoggerFactory.getLogger(TSServiceImpl.class);
+ private static final Logger ALL_SQL_LOGGER = LoggerFactory.getLogger("ALL-SQL");
private static final Logger SLOW_SQL_LOGGER = LoggerFactory.getLogger("SLOW-SQL");
private static final Logger QUERY_FREQUENCY_LOGGER = LoggerFactory.getLogger("QUERY-FREQUENCY");
private static final String INFO_NOT_LOGIN = "{}: Not login.";
@@ -563,6 +564,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
private TSExecuteStatementResp internalExecuteQueryStatement(String statement,
long statementId, PhysicalPlan plan, int fetchSize, String username) {
queryCount.incrementAndGet();
+ ALL_SQL_LOGGER.info(statement);
long startTime = System.currentTimeMillis();
long queryId = -1;
try {