Skip to content

Commit 8515441

Browse files
authored
Pipe: Further reduced the repeating pipe logs (#17366)
* co-1 * by * fix
1 parent 4dbda78 commit 8515441

4 files changed

Lines changed: 31 additions & 25 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,21 @@ public TSStatus visitRelationalInsertTablet(
9696
}
9797

9898
@Override
99-
public TSStatus visitInsertTablet(InsertTabletNode node, DataRegion dataRegion) {
99+
public TSStatus visitInsertTablet(final InsertTabletNode node, final DataRegion dataRegion) {
100100
try {
101101
dataRegion.insertTablet(node);
102102
dataRegion.insertSeparatorToWAL();
103103
return StatusUtils.OK;
104-
} catch (OutOfTTLException e) {
105-
LOGGER.warn("Error in executing plan node: {}, caused by {}", node, e.getMessage());
104+
} catch (final OutOfTTLException e) {
105+
LOGGER.debug("Error in executing plan node: {}, caused by {}", node, e.getMessage());
106106
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
107-
} catch (WriteProcessRejectException e) {
107+
} catch (final WriteProcessRejectException e) {
108108
LOGGER.warn("Reject in executing plan node: {}, caused by {}", node, e.getMessage());
109109
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
110-
} catch (WriteProcessException e) {
110+
} catch (final WriteProcessException e) {
111111
LOGGER.error("Error in executing plan node: {}", node, e);
112112
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
113-
} catch (BatchProcessException e) {
113+
} catch (final BatchProcessException e) {
114114
LOGGER.warn(
115115
"Batch failure in executing a InsertTabletNode. device: {}, startTime: {}, measurements: {}, failing status: {}",
116116
node.getTargetPath(),
@@ -119,7 +119,7 @@ public TSStatus visitInsertTablet(InsertTabletNode node, DataRegion dataRegion)
119119
e.getFailingStatus());
120120
// For each error
121121
TSStatus firstStatus = null;
122-
for (TSStatus status : e.getFailingStatus()) {
122+
for (final TSStatus status : e.getFailingStatus()) {
123123
if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
124124
firstStatus = status;
125125
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -830,16 +830,19 @@ private TSStatus executeStatementAndClassifyExceptions(
830830

831831
final TSStatus result =
832832
executeStatementWithPermissionCheckAndRetryOnDataTypeMismatch(statement);
833-
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()
834-
|| result.getCode() == TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) {
833+
final int code = result.getCode();
834+
if (code == TSStatusCode.SUCCESS_STATUS.getStatusCode()
835+
|| code == TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) {
835836
return result;
836837
} else {
837-
PipeLogger.log(
838-
LOGGER::warn,
839-
"Receiver id = %s: Failure status encountered while executing statement %s: %s",
840-
receiverId.get(),
841-
statement.getPipeLoggingString(),
842-
result);
838+
if (code != TSStatusCode.OUT_OF_TTL.getStatusCode()) {
839+
PipeLogger.log(
840+
LOGGER::warn,
841+
"Receiver id = %s: Failure status encountered while executing statement %s: %s",
842+
receiverId.get(),
843+
statement.getPipeLoggingString(),
844+
result);
845+
}
843846
return STATEMENT_STATUS_VISITOR.process(statement, result);
844847
}
845848
} catch (final Exception e) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/AsyncPlanNodeSender.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,14 @@ public List<FailedFragmentInstanceWithStatus> getFailedInstancesWithStatuses() {
128128
RpcUtils.getStatus(
129129
TSStatusCode.WRITE_PROCESS_ERROR, entry.getValue().getMessage())));
130130
} else {
131-
LOGGER.warn(
132-
"dispatch write failed. status: {}, code: {}, message: {}, node {}",
133-
entry.getValue().status,
134-
TSStatusCode.representOf(status.code),
135-
entry.getValue().message,
136-
instances.get(entry.getKey()).getHostDataNode().getInternalEndPoint());
131+
if (status.code != TSStatusCode.OUT_OF_TTL.getStatusCode()) {
132+
LOGGER.warn(
133+
"dispatch write failed. status: {}, code: {}, message: {}, node {}",
134+
entry.getValue().status,
135+
TSStatusCode.representOf(status.code),
136+
entry.getValue().message,
137+
instances.get(entry.getKey()).getHostDataNode().getInternalEndPoint());
138+
}
137139
failureFragmentInstanceWithStatusList.add(
138140
new FailedFragmentInstanceWithStatus(instance, status));
139141
}

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeAbstractSinkSubtask.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,11 @@ public void onFailure(final Throwable throwable) {
163163
* @return {@code true} if the {@link PipeSubtask} should be stopped, {@code false} otherwise
164164
*/
165165
private boolean onPipeConnectionException(final Throwable throwable) {
166-
LOGGER.warn(
167-
"PipeConnectionException occurred, {} retries to handshake with the target system.",
168-
outputPipeSink.getClass().getName(),
169-
throwable);
166+
PipeLogger.log(
167+
LOGGER::warn,
168+
throwable,
169+
"PipeConnectionException occurred, %s retries to handshake with the target system.",
170+
outputPipeSink.getClass().getName());
170171

171172
int retry = 0;
172173
while (retry < MAX_RETRY_TIMES) {

0 commit comments

Comments
 (0)