Skip to content

Commit d961572

Browse files
CaideyipiJackieTien97
authored andcommitted
may_fix (#16814)
(cherry picked from commit d997408)
1 parent cee173b commit d961572

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
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
@@ -847,10 +847,10 @@ private TSStatus executeStatementAndClassifyExceptions(
847847
} catch (final Exception e) {
848848
PipeLogger.log(
849849
LOGGER::warn,
850+
e,
850851
"Receiver id = %s: Exception encountered while executing statement %s: ",
851852
receiverId.get(),
852-
statement.getPipeLoggingString(),
853-
e);
853+
statement.getPipeLoggingString());
854854
return statement.accept(STATEMENT_EXCEPTION_VISITOR, e);
855855
} finally {
856856
if (Objects.nonNull(allocatedMemoryBlock)) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementExceptionVisitor.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import org.apache.iotdb.db.queryengine.plan.statement.metadata.template.BatchActivateTemplateStatement;
4040
import org.apache.iotdb.rpc.TSStatusCode;
4141

42+
import java.util.Objects;
43+
4244
/**
4345
* This visitor translated some exceptions to pipe related {@link TSStatus} to help sender classify
4446
* them and apply different error handling tactics. Please DO NOT modify the exceptions returned by
@@ -130,7 +132,11 @@ public TSStatus visitBatchActivateTemplate(
130132
private TSStatus visitGeneralActivateTemplate(
131133
final Statement activateTemplateStatement, final Exception context) {
132134
if (context instanceof MetadataException || context instanceof StatementAnalyzeException) {
133-
return new TSStatus(TSStatusCode.PIPE_RECEIVER_USER_CONFLICT_EXCEPTION.getStatusCode())
135+
return (Objects.nonNull(context.getMessage())
136+
&& context.getMessage().contains("has not been set any template")
137+
? new TSStatus(
138+
TSStatusCode.PIPE_RECEIVER_PARALLEL_OR_USER_CONFLICT_EXCEPTION.getStatusCode())
139+
: new TSStatus(TSStatusCode.PIPE_RECEIVER_USER_CONFLICT_EXCEPTION.getStatusCode()))
134140
.setMessage(context.getMessage());
135141
} else if (isAutoCreateConflict(context)) {
136142
return new TSStatus(TSStatusCode.PIPE_RECEIVER_USER_CONFLICT_EXCEPTION.getStatusCode())

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTSStatusVisitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ private TSStatus visitGeneralActivateTemplate(
270270
if (context.getCode() == TSStatusCode.METADATA_ERROR.getStatusCode()
271271
&& context.isSetMessage()
272272
&& context.getMessage().contains("has not been set any template")) {
273-
return new TSStatus(TSStatusCode.PIPE_RECEIVER_USER_CONFLICT_EXCEPTION.getStatusCode())
273+
return new TSStatus(
274+
TSStatusCode.PIPE_RECEIVER_PARALLEL_OR_USER_CONFLICT_EXCEPTION.getStatusCode())
274275
.setMessage(context.getMessage());
275276
}
276277
return visitStatement(activateTemplateStatement, context);

0 commit comments

Comments
 (0)