Skip to content

Commit aa899cc

Browse files
authored
Pipe: Added log control for pipe receiver auth exception (apache#16659)
1 parent 23b1313 commit aa899cc

File tree

8 files changed

+67
-3
lines changed

8 files changed

+67
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ private TSStatus executeStatementAndClassifyExceptions(
831831
LOGGER::warn,
832832
"Receiver id = %s: Failure status encountered while executing statement %s: %s",
833833
receiverId.get(),
834-
statement,
834+
statement.getPipeLoggingString(),
835835
result);
836836
return statement.accept(STATEMENT_STATUS_VISITOR, result);
837837
}
@@ -840,7 +840,7 @@ private TSStatus executeStatementAndClassifyExceptions(
840840
LOGGER::warn,
841841
"Receiver id = %s: Exception encountered while executing statement %s: ",
842842
receiverId.get(),
843-
statement,
843+
statement.getPipeLoggingString(),
844844
e);
845845
return statement.accept(STATEMENT_EXCEPTION_VISITOR, e);
846846
} finally {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,8 @@ public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement toRelat
6464
final MPPQueryContext context) {
6565
throw new UnsupportedOperationException("Method not implemented yet");
6666
}
67+
68+
public String getPipeLoggingString() {
69+
return toString();
70+
}
6771
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,12 @@ public void removeAttributeColumns() {
200200
protected void subRemoveAttributeColumns(List<Integer> columnsToKeep) {
201201
insertTabletStatementList.forEach(InsertBaseStatement::removeAttributeColumns);
202202
}
203+
204+
@Override
205+
public String toString() {
206+
return "InsertMultiTabletsStatement{"
207+
+ "insertTabletStatementList="
208+
+ insertTabletStatementList
209+
+ '}';
210+
}
203211
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,4 +548,28 @@ protected void subRemoveAttributeColumns(List<Integer> columnsToKeep) {
548548
values = columnsToKeep.stream().map(i -> values[i]).toArray();
549549
}
550550
}
551+
552+
@Override
553+
public String getPipeLoggingString() {
554+
return "InsertRowNode{"
555+
+ "deviceID="
556+
+ deviceID
557+
+ ", time="
558+
+ time
559+
+ ", valueLength="
560+
+ (Objects.nonNull(values) ? values.length : 0)
561+
+ '}';
562+
}
563+
564+
@Override
565+
public String toString() {
566+
return "InsertRowNode{"
567+
+ "deviceID="
568+
+ deviceID
569+
+ ", time="
570+
+ time
571+
+ ", values="
572+
+ Arrays.toString(values)
573+
+ '}';
574+
}
551575
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,4 +237,9 @@ public void removeAttributeColumns() {
237237
protected void subRemoveAttributeColumns(List<Integer> columnsToKeep) {
238238
insertRowStatementList.forEach(InsertBaseStatement::removeAttributeColumns);
239239
}
240+
241+
@Override
242+
public String toString() {
243+
return "InsertRowsStatement{" + "insertRowStatementList=" + insertRowStatementList + '}';
244+
}
240245
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,4 +640,21 @@ protected void subRemoveAttributeColumns(List<Integer> columnsToKeep) {
640640
nullBitMaps = columnsToKeep.stream().map(i -> nullBitMaps[i]).toArray(BitMap[]::new);
641641
}
642642
}
643+
644+
@Override
645+
public String toString() {
646+
return "InsertTabletStatement{"
647+
+ "deviceIDs="
648+
+ Arrays.toString(deviceIDs)
649+
+ ", measurements="
650+
+ Arrays.toString(measurements)
651+
+ ", rowCount="
652+
+ rowCount
653+
+ ", timeRange=["
654+
+ (Objects.nonNull(times) && times.length > 0
655+
? times[0] + ", " + times[times.length - 1]
656+
: "")
657+
+ "]"
658+
+ '}';
659+
}
643660
}

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeSinkCriticalException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static PipeRuntimeSinkCriticalException deserializeFrom(
9393

9494
@Override
9595
public String toString() {
96-
return "PipeRuntimeConnectorCriticalException{"
96+
return "PipeRuntimeSinkCriticalException{"
9797
+ "message='"
9898
+ getMessage()
9999
+ "', timeStamp="

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeSinkRetryTimesConfigurableException.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,10 @@ public PipeRuntimeSinkRetryTimesConfigurableException(
3333
public int getRetryTimes() {
3434
return retryTimes;
3535
}
36+
37+
// We do not record the timestamp here for logger reduction detection
38+
@Override
39+
public String toString() {
40+
return "PipeRuntimeSinkRetryTimesConfigurableException{" + "message='" + getMessage() + "}";
41+
}
3642
}

0 commit comments

Comments
 (0)