Skip to content

Commit 1c1cbca

Browse files
authored
fix (#17455)
1 parent cca9dbb commit 1c1cbca

2 files changed

Lines changed: 4 additions & 27 deletions

File tree

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/AbstractOperateSubscriptionProcedure.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ protected Flow executeFromState(ConfigNodeProcedureEnv env, OperateSubscriptionS
224224
getCycles() + 1,
225225
RETRY_THRESHOLD,
226226
e);
227+
setNextState(getCurrentState());
227228
// Wait 3s for next retry
228229
TimeUnit.MILLISECONDS.sleep(3000L);
229230
} else {

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -168,34 +168,21 @@ private TSStatus visitGeneralCreateTimeSeries(final Statement statement, final T
168168
@Override
169169
public TSStatus visitCreateMultiTimeSeries(
170170
final CreateMultiTimeSeriesStatement createMultiTimeSeriesStatement, final TSStatus status) {
171-
return visitGeneralCreateMultiTimeSeries(createMultiTimeSeriesStatement, status);
171+
return visitGeneralCreateTimeSeries(createMultiTimeSeriesStatement, status);
172172
}
173173

174174
@Override
175175
public TSStatus visitInternalCreateTimeseries(
176176
final InternalCreateTimeSeriesStatement internalCreateTimeSeriesStatement,
177177
final TSStatus status) {
178-
return visitGeneralCreateMultiTimeSeries(internalCreateTimeSeriesStatement, status);
178+
return visitGeneralCreateTimeSeries(internalCreateTimeSeriesStatement, status);
179179
}
180180

181181
@Override
182182
public TSStatus visitInternalCreateMultiTimeSeries(
183183
final InternalCreateMultiTimeSeriesStatement internalCreateMultiTimeSeriesStatement,
184184
final TSStatus status) {
185-
return visitGeneralCreateMultiTimeSeries(internalCreateMultiTimeSeriesStatement, status);
186-
}
187-
188-
private TSStatus visitGeneralCreateMultiTimeSeries(
189-
final Statement statement, final TSStatus status) {
190-
if (status.getCode() == TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()
191-
|| status.getCode() == TSStatusCode.ALIAS_ALREADY_EXIST.getStatusCode()) {
192-
return new TSStatus(TSStatusCode.PIPE_RECEIVER_IDEMPOTENT_CONFLICT_EXCEPTION.getStatusCode())
193-
.setMessage(status.getMessage());
194-
} else if (status.getCode() == TSStatusCode.SCHEMA_QUOTA_EXCEEDED.getStatusCode()) {
195-
return new TSStatus(TSStatusCode.PIPE_RECEIVER_USER_CONFLICT_EXCEPTION.getStatusCode())
196-
.setMessage(status.getMessage());
197-
}
198-
return visitStatement(statement, status);
185+
return visitGeneralCreateTimeSeries(internalCreateMultiTimeSeriesStatement, status);
199186
}
200187

201188
@Override
@@ -236,17 +223,6 @@ public TSStatus visitActivateTemplate(
236223
@Override
237224
public TSStatus visitBatchActivateTemplate(
238225
final BatchActivateTemplateStatement batchActivateTemplateStatement, final TSStatus status) {
239-
if (status.getCode() == TSStatusCode.TEMPLATE_IS_IN_USE.getStatusCode()) {
240-
return new TSStatus(TSStatusCode.PIPE_RECEIVER_IDEMPOTENT_CONFLICT_EXCEPTION.getStatusCode())
241-
.setMessage(status.getMessage());
242-
}
243-
if (status.getCode() == TSStatusCode.METADATA_ERROR.getStatusCode()
244-
&& status.isSetMessage()
245-
&& status.getMessage().contains("has not been set any template")) {
246-
return new TSStatus(
247-
TSStatusCode.PIPE_RECEIVER_PARALLEL_OR_USER_CONFLICT_EXCEPTION.getStatusCode())
248-
.setMessage(status.getMessage());
249-
}
250226
return visitGeneralActivateTemplate(batchActivateTemplateStatement, status);
251227
}
252228

0 commit comments

Comments
 (0)