This is an automated email from the ASF dual-hosted git repository.
kangkaisen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new a61eea3 Make some debug log settings configurable and change some
log level from info to debug to avoid performance bottlenecks (#4766)
a61eea3 is described below
commit a61eea3b2e76d741c98b9faed8cec51c1d469f94
Author: caiconghui <[email protected]>
AuthorDate: Mon Oct 26 16:10:19 2020 +0800
Make some debug log settings configurable and change some log level from
info to debug to avoid performance bottlenecks (#4766)
---
.../main/java/org/apache/doris/common/Config.java | 2 +-
.../java/org/apache/doris/common/Log4jConfig.java | 14 +---------
.../doris/common/ThriftServerEventProcessor.java | 9 +++---
.../java/org/apache/doris/http/BaseAction.java | 2 +-
.../org/apache/doris/http/rest/RestBaseAction.java | 2 +-
.../apache/doris/service/FrontendServiceImpl.java | 32 ++++++++--------------
6 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
index 091b3b8..4e82b66 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
@@ -68,7 +68,7 @@ public class Config extends ConfigBase {
public static String sys_log_dir = PaloFe.DORIS_HOME_DIR + "/log";
@ConfField public static String sys_log_level = "INFO";
@ConfField public static int sys_log_roll_num = 10;
- @ConfField public static String[] sys_log_verbose_modules = {};
+ @ConfField public static String[] sys_log_verbose_modules =
{"org.apache.thrift", "org.apache.doris.thrift", "org.apache.doris.http",
"org.apache.doris.service.FrontendServiceImpl"};
@ConfField public static String sys_log_roll_interval = "DAY";
@ConfField public static String sys_log_delete_age = "7d";
@Deprecated
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
index 9296bad..98944fd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
@@ -96,18 +96,6 @@ public class Log4jConfig extends XmlConfiguration {
" <Logger name=\"audit\" level=\"ERROR\"
additivity=\"false\">\n" +
" <AppenderRef ref=\"Auditfile\"/>\n" +
" </Logger>\n" +
- " <Logger name=\"org.apache.thrift\" level=\"DEBUG\"> \n" +
- " <AppenderRef ref=\"Sys\"/>\n" +
- " </Logger>\n" +
- " <Logger name=\"org.apache.thrift.transport\" level=\"DEBUG\">
\n" +
- " <AppenderRef ref=\"Sys\"/>\n" +
- " </Logger>\n" +
- " <Logger name=\"org.apache.doris.thrift\" level=\"DEBUG\"> \n"
+
- " <AppenderRef ref=\"Sys\"/>\n" +
- " </Logger>\n" +
- " <Logger name=\"org.apache.doris.http\" level=\"DEBUG\"> \n" +
- " <AppenderRef ref=\"Sys\"/>\n" +
- " </Logger>\n" +
" <!--REPLACED BY AUDIT AND VERBOSE MODULE NAMES-->\n" +
" </Loggers>\n" +
"</Configuration>";
@@ -254,6 +242,6 @@ public class Log4jConfig extends XmlConfiguration {
if (toReconfig) {
reconfig();
}
- return new Tuple<String, String[], String[]>(sysLogLevel,
verboseModules, auditModules);
+ return new Tuple<>(sysLogLevel, verboseModules, auditModules);
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java
index 9949413..74be897 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java
@@ -75,7 +75,7 @@ public class ThriftServerEventProcessor implements
TServerEventHandler {
break;
}
if (tSocket == null) {
- LOG.info("fail to get client socket. server type: {}",
thriftServer.getType());
+ LOG.warn("fail to get client socket. server type: {}",
thriftServer.getType());
return null;
}
SocketAddress socketAddress =
tSocket.getSocket().getRemoteSocketAddress();
@@ -83,7 +83,7 @@ public class ThriftServerEventProcessor implements
TServerEventHandler {
if (socketAddress instanceof InetSocketAddress) {
inetSocketAddress = (InetSocketAddress) socketAddress;
} else {
- LOG.info("fail to get client socket address. server type: {}",
+ LOG.warn("fail to get client socket address. server type: {}",
thriftServer.getType());
return null;
}
@@ -93,7 +93,7 @@ public class ThriftServerEventProcessor implements
TServerEventHandler {
thriftServer.addConnect(clientAddress);
- LOG.info("create thrift context. client: {}", clientAddress);
+ LOG.debug("create thrift context. client: {}", clientAddress);
return new ThriftServerContext(clientAddress);
}
@@ -108,7 +108,7 @@ public class ThriftServerEventProcessor implements
TServerEventHandler {
TNetworkAddress clientAddress = thriftServerContext.getClient();
connectionContext.remove();
thriftServer.removeConnect(clientAddress);
- LOG.info("delete thrift context. client: {}", clientAddress);
+ LOG.debug("delete thrift context. client: {}", clientAddress);
}
@Override
@@ -119,7 +119,6 @@ public class ThriftServerEventProcessor implements
TServerEventHandler {
ThriftServerContext thriftServerContext = (ThriftServerContext)
serverContext;
TNetworkAddress clientAddress = thriftServerContext.getClient();
- Preconditions.checkState(serverContext instanceof ThriftServerContext);
connectionContext.set(new ThriftServerContext(clientAddress));
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/http/BaseAction.java
b/fe/fe-core/src/main/java/org/apache/doris/http/BaseAction.java
index ed35da9..b3df5e3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/http/BaseAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/http/BaseAction.java
@@ -84,7 +84,7 @@ public abstract class BaseAction implements IAction {
@Override
public void handleRequest(BaseRequest request) throws Exception {
BaseResponse response = new BaseResponse();
- LOG.info("receive http request. url={}", request.getRequest().uri());
+ LOG.debug("receive http request. url={}", request.getRequest().uri());
try {
execute(request, response);
} catch (Exception e) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/http/rest/RestBaseAction.java
b/fe/fe-core/src/main/java/org/apache/doris/http/rest/RestBaseAction.java
index d9bb768..b6477a7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/http/rest/RestBaseAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/http/rest/RestBaseAction.java
@@ -49,7 +49,7 @@ public class RestBaseAction extends BaseAction {
@Override
public void handleRequest(BaseRequest request) throws Exception {
- LOG.info("receive http request. url={}", request.getRequest().uri());
+ LOG.debug("receive http request. url={}", request.getRequest().uri());
BaseResponse response = new BaseResponse();
try {
execute(request, response);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 0f1a467..e29aa96 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -127,7 +127,7 @@ import static
org.apache.doris.thrift.TStatusCode.NOT_IMPLEMENTED_ERROR;
// Frontend service used to serve all request for this frontend through
// thrift protocol
public class FrontendServiceImpl implements FrontendService.Iface {
- private static final Logger LOG = LogManager.getLogger(MasterImpl.class);
+ private static final Logger LOG =
LogManager.getLogger(FrontendServiceImpl.class);
private MasterImpl masterImpl;
private ExecuteEnv exeEnv;
@@ -377,7 +377,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Deprecated
@Override
public TFeResult miniLoad(TMiniLoadRequest request) throws TException {
- LOG.info("receive mini load request: label: {}, db: {}, tbl: {},
backend: {}",
+ LOG.debug("receive mini load request: label: {}, db: {}, tbl: {},
backend: {}",
request.getLabel(), request.getDb(), request.getTbl(),
request.getBackend());
ConnectContext context = new ConnectContext(null);
@@ -499,7 +499,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
// update etl task status
TMiniLoadEtlStatusResult statusResult = request.getEtlTaskStatus();
- LOG.info("load job id: {}, etl task id: {}, status: {}", jobId,
taskId, statusResult);
+ LOG.debug("load job id: {}, etl task id: {}, status: {}", jobId,
taskId, statusResult);
EtlStatus taskStatus = taskInfo.getTaskStatus();
if (taskStatus.setState(statusResult.getEtlState())) {
if (statusResult.isSetCounters()) {
@@ -517,7 +517,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TMiniLoadBeginResult miniLoadBegin(TMiniLoadBeginRequest request)
throws TException {
- LOG.info("receive mini load begin request. label: {}, user: {}, ip:
{}",
+ LOG.debug("receive mini load begin request. label: {}, user: {}, ip:
{}",
request.getLabel(), request.getUser(), request.getUserIp());
TMiniLoadBeginResult result = new TMiniLoadBeginResult();
@@ -577,7 +577,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
}
// add this log so that we can track this stmt
- LOG.info("receive forwarded stmt {} from FE: {}", params.getStmtId(),
clientAddr.getHostname());
+ LOG.debug("receive forwarded stmt {} from FE: {}", params.getStmtId(),
clientAddr.getHostname());
ConnectContext context = new ConnectContext(null);
ConnectProcessor processor = new ConnectProcessor(context);
TMasterOpResult result = processor.proxyExecute(params);
@@ -604,7 +604,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TFeResult loadCheck(TLoadCheckRequest request) throws TException {
- LOG.info("receive load check request. label: {}, user: {}, ip: {}",
+ LOG.debug("receive load check request. label: {}, user: {}, ip: {}",
request.getLabel(), request.getUser(), request.getUserIp());
TStatus status = new TStatus(TStatusCode.OK);
@@ -634,9 +634,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TLoadTxnBeginResult loadTxnBegin(TLoadTxnBeginRequest request)
throws TException {
String clientAddr = getClientAddrAsString();
- LOG.info("receive txn begin request, db: {}, tbl: {}, label: {},
backend: {}",
- request.getDb(), request.getTbl(), request.getLabel(),
clientAddr);
- LOG.debug("txn begin request: {}", request);
+ LOG.debug("receive txn begin request: {}, backend: {}", request,
clientAddr);
TLoadTxnBeginResult result = new TLoadTxnBeginResult();
TStatus status = new TStatus(TStatusCode.OK);
@@ -645,7 +643,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
result.setTxnId(loadTxnBeginImpl(request, clientAddr));
} catch (DuplicatedRequestException e) {
// this is a duplicate request, just return previous txn id
- LOG.info("duplicate request for stream load. request id: {}, txn:
{}", e.getDuplicatedRequestId(), e.getTxnId());
+ LOG.warn("duplicate request for stream load. request id: {}, txn:
{}", e.getDuplicatedRequestId(), e.getTxnId());
result.setTxnId(e.getTxnId());
} catch (LabelAlreadyUsedException e) {
status.setStatusCode(TStatusCode.LABEL_ALREADY_EXISTS);
@@ -712,9 +710,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TLoadTxnCommitResult loadTxnCommit(TLoadTxnCommitRequest request)
throws TException {
String clientAddr = getClientAddrAsString();
- LOG.info("receive txn commit request. db: {}, tbl: {}, txn id: {},
backend: {}",
- request.getDb(), request.getTbl(), request.getTxnId(),
clientAddr);
- LOG.debug("txn commit request: {}", request);
+ LOG.debug("receive txn commit request: {}, backend: {}", request,
clientAddr);
TLoadTxnCommitResult result = new TLoadTxnCommitResult();
TStatus status = new TStatus(TStatusCode.OK);
@@ -778,10 +774,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TLoadTxnRollbackResult loadTxnRollback(TLoadTxnRollbackRequest
request) throws TException {
String clientAddr = getClientAddrAsString();
- LOG.info("receive txn rollback request. db: {}, tbl: {}, txn id: {},
reason: {}, backend: {}",
- request.getDb(), request.getTbl(), request.getTxnId(),
request.getReason(), clientAddr);
- LOG.debug("txn rollback request: {}", request);
-
+ LOG.debug("receive txn rollback request: {}, backend: {}", request,
clientAddr);
TLoadTxnRollbackResult result = new TLoadTxnRollbackResult();
TStatus status = new TStatus(TStatusCode.OK);
result.setStatus(status);
@@ -827,10 +820,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TStreamLoadPutResult streamLoadPut(TStreamLoadPutRequest request) {
String clientAddr = getClientAddrAsString();
- LOG.info("receive stream load put request. db:{}, tbl: {}, txn id: {},
load id: {}, backend: {}",
- request.getDb(), request.getTbl(), request.getTxnId(),
DebugUtil.printId(request.getLoadId()),
- clientAddr);
- LOG.debug("stream load put request: {}", request);
+ LOG.debug("receive stream load put request: {}, backend: {}", request,
clientAddr);
TStreamLoadPutResult result = new TStreamLoadPutResult();
TStatus status = new TStatus(TStatusCode.OK);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
