Skip to content

Commit 8ccd7c6

Browse files
authored
[To dev/1.3] Subscription: Fixed the retry bug of procedures & Pipe: Deleted some useless codes (#17455) (#17484)
1 parent 1f1d2c1 commit 8ccd7c6

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
@@ -167,34 +167,21 @@ private TSStatus visitGeneralCreateTimeSeries(final Statement statement, final T
167167
@Override
168168
public TSStatus visitCreateMultiTimeSeries(
169169
final CreateMultiTimeSeriesStatement createMultiTimeSeriesStatement, final TSStatus status) {
170-
return visitGeneralCreateMultiTimeSeries(createMultiTimeSeriesStatement, status);
170+
return visitGeneralCreateTimeSeries(createMultiTimeSeriesStatement, status);
171171
}
172172

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

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

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

0 commit comments

Comments
 (0)