This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ChangeInfoLogToDebug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b499090cea22f1e06c44cbf01cf1ac1f6f8ffff7 Author: JackieTien97 <[email protected]> AuthorDate: Mon Oct 31 21:45:57 2022 +0800 Change log level of some messages from INFO to DEBUG --- .../db/mpp/execution/exchange/LocalSinkHandle.java | 14 +++++++------- .../db/mpp/execution/exchange/LocalSourceHandle.java | 12 ++++++------ .../mpp/execution/exchange/MPPDataExchangeManager.java | 18 +++++++++--------- .../iotdb/db/mpp/execution/exchange/SinkHandle.java | 16 ++++++++-------- .../iotdb/db/mpp/execution/exchange/SourceHandle.java | 16 ++++++++-------- .../java/org/apache/iotdb/db/mpp/plan/Coordinator.java | 4 ++-- .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 8 ++++---- .../iotdb/db/mpp/plan/execution/QueryExecution.java | 8 ++++---- .../iotdb/db/mpp/plan/scheduler/ClusterScheduler.java | 2 +- .../thrift/impl/DataNodeInternalRPCServiceImpl.java | 4 ++-- 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java index 1f70ff4460..bcf469b38d 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java @@ -113,7 +113,7 @@ public class LocalSinkHandle implements ISinkHandle { if (queue.hasNoMoreTsBlocks()) { return; } - logger.info("[StartSendTsBlockOnLocal]"); + logger.debug("[StartSendTsBlockOnLocal]"); synchronized (this) { blocked = queue.add(tsBlock); } @@ -129,7 +129,7 @@ public class LocalSinkHandle implements ISinkHandle { public void setNoMoreTsBlocks() { synchronized (queue) { synchronized (this) { - logger.info("[StartSetNoMoreTsBlocksOnLocal]"); + logger.debug("[StartSetNoMoreTsBlocksOnLocal]"); if (aborted || closed) { return; } @@ -138,12 +138,12 @@ public class LocalSinkHandle implements ISinkHandle { } } checkAndInvokeOnFinished(); - logger.info("[EndSetNoMoreTsBlocksOnLocal]"); + logger.debug("[EndSetNoMoreTsBlocksOnLocal]"); } @Override public void abort() { - logger.info("[StartAbortLocalSinkHandle]"); + logger.debug("[StartAbortLocalSinkHandle]"); synchronized (queue) { synchronized (this) { if (aborted || closed) { @@ -154,12 +154,12 @@ public class LocalSinkHandle implements ISinkHandle { sinkHandleListener.onAborted(this); } } - logger.info("[EndAbortLocalSinkHandle]"); + logger.debug("[EndAbortLocalSinkHandle]"); } @Override public void close() { - logger.info("[StartCloseLocalSinkHandle]"); + logger.debug("[StartCloseLocalSinkHandle]"); synchronized (queue) { synchronized (this) { if (aborted || closed) { @@ -170,7 +170,7 @@ public class LocalSinkHandle implements ISinkHandle { sinkHandleListener.onFinish(this); } } - logger.info("[EndCloseLocalSinkHandle]"); + logger.debug("[EndCloseLocalSinkHandle]"); } public TFragmentInstanceId getRemoteFragmentInstanceId() { diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSourceHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSourceHandle.java index c847af598b..4db83c9b88 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSourceHandle.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSourceHandle.java @@ -99,11 +99,11 @@ public class LocalSourceHandle implements ISourceHandle { tsBlock = queue.remove(); } if (tsBlock != null) { - currSequenceId++; - logger.info( + logger.debug( "[GetTsBlockFromQueue] TsBlock:{} size:{}", currSequenceId, tsBlock.getRetainedSizeInBytes()); + currSequenceId++; } checkAndInvokeOnFinished(); return tsBlock; @@ -161,7 +161,7 @@ public class LocalSourceHandle implements ISourceHandle { return; } try (SetThreadName sourceHandleName = new SetThreadName(threadName)) { - logger.info("[StartAbortLocalSourceHandle]"); + logger.debug("[StartAbortLocalSourceHandle]"); synchronized (queue) { synchronized (this) { if (aborted || closed) { @@ -172,7 +172,7 @@ public class LocalSourceHandle implements ISourceHandle { sourceHandleListener.onAborted(this); } } - logger.info("[EndAbortLocalSourceHandle]"); + logger.debug("[EndAbortLocalSourceHandle]"); } } @@ -182,7 +182,7 @@ public class LocalSourceHandle implements ISourceHandle { return; } try (SetThreadName sourceHandleName = new SetThreadName(threadName)) { - logger.info("[StartCloseLocalSourceHandle]"); + logger.debug("[StartCloseLocalSourceHandle]"); synchronized (queue) { synchronized (this) { if (aborted || closed) { @@ -193,7 +193,7 @@ public class LocalSourceHandle implements ISourceHandle { sourceHandleListener.onFinished(this); } } - logger.info("[EndCloseLocalSourceHandle]"); + logger.debug("[EndCloseLocalSourceHandle]"); } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java index b9376021a5..52a4d5bbc1 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java @@ -220,7 +220,7 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { @Override public void onFinished(ISourceHandle sourceHandle) { - logger.info("[ScHListenerOnFinish]"); + logger.debug("[ScHListenerOnFinish]"); if (!sourceHandles.containsKey(sourceHandle.getLocalFragmentInstanceId()) || !sourceHandles .get(sourceHandle.getLocalFragmentInstanceId()) @@ -239,7 +239,7 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { @Override public void onAborted(ISourceHandle sourceHandle) { - logger.info("[ScHListenerOnAbort]"); + logger.debug("[ScHListenerOnAbort]"); onFinished(sourceHandle); } @@ -267,20 +267,20 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { @Override public void onFinish(ISinkHandle sinkHandle) { - logger.info("[SkHListenerOnFinish]"); + logger.debug("[SkHListenerOnFinish]"); removeFromMPPDataExchangeManager(sinkHandle); context.finished(); } @Override public void onEndOfBlocks(ISinkHandle sinkHandle) { - logger.info("[SkHListenerOnEndOfTsBlocks]"); + logger.debug("[SkHListenerOnEndOfTsBlocks]"); context.transitionToFlushing(); } @Override public void onAborted(ISinkHandle sinkHandle) { - logger.info("[SkHListenerOnAbort]"); + logger.debug("[SkHListenerOnAbort]"); removeFromMPPDataExchangeManager(sinkHandle); } @@ -288,7 +288,7 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { if (sinkHandles.remove(sinkHandle.getLocalFragmentInstanceId()) == null) { logger.warn("[RemoveNoSinkHandle]"); } else { - logger.info("[RemoveSinkHandle]"); + logger.debug("[RemoveSinkHandle]"); } } @@ -499,7 +499,7 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { * <p>This method should be called when a fragment instance finished in an abnormal state. */ public void forceDeregisterFragmentInstance(TFragmentInstanceId fragmentInstanceId) { - logger.info("[StartForceReleaseFIDataExchangeResource]"); + logger.debug("[StartForceReleaseFIDataExchangeResource]"); if (sinkHandles.containsKey(fragmentInstanceId)) { ISinkHandle sinkHandle = sinkHandles.get(fragmentInstanceId); sinkHandle.abort(); @@ -508,12 +508,12 @@ public class MPPDataExchangeManager implements IMPPDataExchangeManager { if (sourceHandles.containsKey(fragmentInstanceId)) { Map<String, ISourceHandle> planNodeIdToSourceHandle = sourceHandles.get(fragmentInstanceId); for (Entry<String, ISourceHandle> entry : planNodeIdToSourceHandle.entrySet()) { - logger.info("[CloseSourceHandle] {}", entry.getKey()); + logger.debug("[CloseSourceHandle] {}", entry.getKey()); entry.getValue().abort(); } sourceHandles.remove(fragmentInstanceId); } - logger.info("[EndForceReleaseFIDataExchangeResource]"); + logger.debug("[EndForceReleaseFIDataExchangeResource]"); } /** @param suffix should be like [PlanNodeId].SourceHandle/SinHandle */ diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java index 387dc64679..cdd891c66b 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java @@ -171,7 +171,7 @@ public class SinkHandle implements ISinkHandle { } private void sendEndOfDataBlockEvent() throws Exception { - logger.info("[NotifyNoMoreTsBlock]"); + logger.debug("[NotifyNoMoreTsBlock]"); int attempt = 0; TEndOfDataBlockEvent endOfDataBlockEvent = new TEndOfDataBlockEvent( @@ -197,7 +197,7 @@ public class SinkHandle implements ISinkHandle { @Override public synchronized void setNoMoreTsBlocks() { - logger.info("[StartSetNoMoreTsBlocks]"); + logger.debug("[StartSetNoMoreTsBlocks]"); if (aborted || closed) { return; } @@ -216,7 +216,7 @@ public class SinkHandle implements ISinkHandle { @Override public synchronized void abort() { - logger.info("[StartAbortSinkHandle]"); + logger.debug("[StartAbortSinkHandle]"); sequenceIdToTsBlock.clear(); aborted = true; bufferRetainedSizeInBytes -= localMemoryManager.getQueryPool().tryCancel(blocked); @@ -227,12 +227,12 @@ public class SinkHandle implements ISinkHandle { bufferRetainedSizeInBytes = 0; } sinkHandleListener.onAborted(this); - logger.info("[EndAbortSinkHandle]"); + logger.debug("[EndAbortSinkHandle]"); } @Override public synchronized void close() { - logger.info("[StartCloseSinkHandle]"); + logger.debug("[StartCloseSinkHandle]"); sequenceIdToTsBlock.clear(); closed = true; bufferRetainedSizeInBytes -= localMemoryManager.getQueryPool().tryComplete(blocked); @@ -243,7 +243,7 @@ public class SinkHandle implements ISinkHandle { bufferRetainedSizeInBytes = 0; } sinkHandleListener.onFinish(this); - logger.info("[EndCloseSinkHandle]"); + logger.debug("[EndCloseSinkHandle]"); } @Override @@ -308,7 +308,7 @@ public class SinkHandle implements ISinkHandle { freedBytes += entry.getValue().right; bufferRetainedSizeInBytes -= entry.getValue().right; iterator.remove(); - logger.info("[ACKTsBlock] {}.", entry.getKey()); + logger.debug("[ACKTsBlock] {}.", entry.getKey()); } } if (isFinished()) { @@ -381,7 +381,7 @@ public class SinkHandle implements ISinkHandle { @Override public void run() { try (SetThreadName sinkHandleName = new SetThreadName(threadName)) { - logger.info( + logger.debug( "[NotifyNewTsBlock] [{}, {})", startSequenceId, startSequenceId + blockSizes.size()); int attempt = 0; TNewDataBlockEvent newDataBlockEvent = diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java index d788aae6e2..27e4cb9cd3 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java @@ -139,13 +139,13 @@ public class SourceHandle implements ISourceHandle { return null; } long retainedSize = sequenceIdToDataBlockSize.remove(currSequenceId); - logger.info("[GetTsBlockFromBuffer] sequenceId:{}, size:{}", currSequenceId, retainedSize); + logger.debug("[GetTsBlockFromBuffer] sequenceId:{}, size:{}", currSequenceId, retainedSize); currSequenceId += 1; bufferRetainedSizeInBytes -= retainedSize; localMemoryManager.getQueryPool().free(localFragmentInstanceId.getQueryId(), retainedSize); if (sequenceIdToTsBlock.isEmpty() && !isFinished()) { - logger.info("[WaitForMoreTsBlock]"); + logger.debug("[WaitForMoreTsBlock]"); blocked = SettableFuture.create(); } if (isFinished()) { @@ -228,7 +228,7 @@ public class SourceHandle implements ISourceHandle { } synchronized void setNoMoreTsBlocks(int lastSequenceId) { - logger.info("[ReceiveNoMoreTsBlockEvent]"); + logger.debug("[ReceiveNoMoreTsBlockEvent]"); this.lastSequenceId = lastSequenceId; if (!blocked.isDone() && remoteTsBlockedConsumedUp()) { blocked.set(null); @@ -239,7 +239,7 @@ public class SourceHandle implements ISourceHandle { } synchronized void updatePendingDataBlockInfo(int startSequenceId, List<Long> dataBlockSizes) { - logger.info( + logger.debug( "[ReceiveNewTsBlockNotification] [{}, {}), each size is: {}", startSequenceId, startSequenceId + dataBlockSizes.size(), @@ -386,7 +386,7 @@ public class SourceHandle implements ISourceHandle { @Override public void run() { try (SetThreadName sourceHandleName = new SetThreadName(threadName)) { - logger.info("[StartPullTsBlocksFromRemote] [{}, {}) ", startSequenceId, endSequenceId); + logger.debug("[StartPullTsBlocksFromRemote] [{}, {}) ", startSequenceId, endSequenceId); TGetDataBlockRequest req = new TGetDataBlockRequest(remoteFragmentInstanceId, startSequenceId, endSequenceId); int attempt = 0; @@ -398,7 +398,7 @@ public class SourceHandle implements ISourceHandle { List<ByteBuffer> tsBlocks = new ArrayList<>(resp.getTsBlocks().size()); tsBlocks.addAll(resp.getTsBlocks()); - logger.info("[EndPullTsBlocksFromRemote] Count:{}", tsBlocks.size()); + logger.debug("[EndPullTsBlocksFromRemote] Count:{}", tsBlocks.size()); executorService.submit( new SendAcknowledgeDataBlockEventTask(startSequenceId, endSequenceId)); synchronized (SourceHandle.this) { @@ -408,7 +408,7 @@ public class SourceHandle implements ISourceHandle { for (int i = startSequenceId; i < endSequenceId; i++) { sequenceIdToTsBlock.put(i, tsBlocks.get(i - startSequenceId)); } - logger.info("[PutTsBlocksIntoBuffer]"); + logger.debug("[PutTsBlocksIntoBuffer]"); if (!blocked.isDone()) { blocked.set(null); } @@ -468,7 +468,7 @@ public class SourceHandle implements ISourceHandle { @Override public void run() { try (SetThreadName sourceHandleName = new SetThreadName(threadName)) { - logger.info("[SendACKTsBlock] [{}, {}).", startSequenceId, endSequenceId); + logger.debug("[SendACKTsBlock] [{}, {}).", startSequenceId, endSequenceId); int attempt = 0; TAcknowledgeDataBlockEvent acknowledgeDataBlockEvent = new TAcknowledgeDataBlockEvent( diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java index 7ba1f1e623..3095540a53 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java @@ -120,7 +120,7 @@ public class Coordinator { QueryId globalQueryId = queryIdGenerator.createNextQueryId(); try (SetThreadName queryName = new SetThreadName(globalQueryId.getId())) { if (sql != null && sql.length() > 0) { - LOGGER.info("[QueryStart] sql: {}", sql); + LOGGER.debug("[QueryStart] sql: {}", sql); } MPPQueryContext queryContext = new MPPQueryContext( @@ -193,7 +193,7 @@ public class Coordinator { IQueryExecution queryExecution = getQueryExecution(queryId); if (queryExecution != null) { try (SetThreadName threadName = new SetThreadName(queryExecution.getQueryId())) { - LOGGER.info("[CleanUpQuery]]"); + LOGGER.debug("[CleanUpQuery]]"); queryExecution.stopAndCleanup(); queryExecutionMap.remove(queryId); } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java index 493b6814ca..307b9778a5 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java @@ -193,14 +193,14 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext> analysis.setStatement(queryStatement); // request schema fetch API - logger.info("[StartFetchSchema]"); + logger.debug("[StartFetchSchema]"); ISchemaTree schemaTree; if (queryStatement.isGroupByTag()) { schemaTree = schemaFetcher.fetchSchemaWithTags(patternTree); } else { schemaTree = schemaFetcher.fetchSchema(patternTree); } - logger.info("[EndFetchSchema]"); + logger.debug("[EndFetchSchema]"); // If there is no leaf node in the schema tree, the query should be completed immediately if (schemaTree.isEmpty()) { if (queryStatement.isSelectInto()) { @@ -1882,9 +1882,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext> if (showTimeSeriesStatement.isOrderByHeat()) { patternTree.constructTree(); // request schema fetch API - logger.info("[StartFetchSchema]"); + logger.debug("[StartFetchSchema]"); ISchemaTree schemaTree = schemaFetcher.fetchSchema(patternTree); - logger.info("[EndFetchSchema]]"); + logger.debug("[EndFetchSchema]]"); List<MeasurementPath> allSelectedPath = schemaTree.getAllMeasurement(); Set<Expression> sourceExpressions = diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java index edbff46b71..4875612f7c 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java @@ -156,7 +156,7 @@ public class QueryExecution implements IQueryExecution { if (state == QueryState.FAILED || state == QueryState.ABORTED || state == QueryState.CANCELED) { - logger.info("[ReleaseQueryResource] state is: {}", state); + logger.debug("[ReleaseQueryResource] state is: {}", state); releaseResource(); } } @@ -170,7 +170,7 @@ public class QueryExecution implements IQueryExecution { public void start() { if (skipExecute()) { - logger.info("[SkipExecute]"); + logger.debug("[SkipExecute]"); if (context.getQueryType() == QueryType.WRITE && analysis.isFailed()) { stateMachine.transitionToFailed(new RuntimeException(analysis.getFailMessage())); } else { @@ -288,7 +288,7 @@ public class QueryExecution implements IQueryExecution { LogicalPlanner planner = new LogicalPlanner(this.context, this.planOptimizers); this.logicalPlan = planner.plan(this.analysis); if (isQuery()) { - logger.info( + logger.debug( "logical plan is: \n {}", PlanNodeUtil.nodeToString(this.logicalPlan.getRootNode())); } } @@ -298,7 +298,7 @@ public class QueryExecution implements IQueryExecution { DistributionPlanner planner = new DistributionPlanner(this.analysis, this.logicalPlan); this.distributedPlan = planner.planFragments(); if (isQuery()) { - logger.info( + logger.debug( "distribution plan done. Fragment instance count is {}, details is: \n {}", distributedPlan.getInstances().size(), printFragmentInstances(distributedPlan.getInstances())); diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java index 609997bd72..178b91d149 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java @@ -134,7 +134,7 @@ public class ClusterScheduler implements IScheduler { // TODO: (xingtanzjr) start the stateFetcher/heartbeat for each fragment instance this.stateTracker.start(); - logger.info("state tracker starts"); + logger.debug("state tracker starts"); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java index 80cf4941ae..8e49715cbc 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -237,7 +237,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface @Override public TSendFragmentInstanceResp sendFragmentInstance(TSendFragmentInstanceReq req) { - LOGGER.info("receive FragmentInstance to group[{}]", req.getConsensusGroupId()); + LOGGER.debug("receive FragmentInstance to group[{}]", req.getConsensusGroupId()); // deserialize ConsensusGroupId ConsensusGroupId groupId; @@ -273,7 +273,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface @Override public TSendPlanNodeResp sendPlanNode(TSendPlanNodeReq req) { - LOGGER.info("receive PlanNode to group[{}]", req.getConsensusGroupId()); + LOGGER.debug("receive PlanNode to group[{}]", req.getConsensusGroupId()); ConsensusGroupId groupId = ConsensusGroupId.Factory.createFromTConsensusGroupId(req.getConsensusGroupId()); PlanNode planNode = PlanNodeType.deserialize(req.planNode.body);
