Skip to content

Fixed the NullPointerException caused by non-current table procedures#15238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OneSizeFitsQuorum merged 1 commit into from
Mar 31, 2025
Merged

Fixed the NullPointerException caused by non-current table procedures #15238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ...b-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1710,6 +1710,10 @@ public TSStatus setTTL(SetTTLPlan setTTLPlan, final boolean isGeneratedByPipe) {
return waitingProcedureFinished(procedure);
}

private TSStatus waitingProcedureFinished(final long procedureId) {
return waitingProcedureFinished(executor.getProcedures().get(procedureId));
}

/**
* Waiting until the specific procedure finished.
*
Expand DownExpand Up@@ -1871,6 +1875,7 @@ public TDeleteTableDeviceResp deleteDevices(
final TDeleteTableDeviceReq req, final boolean isGeneratedByPipe) {
long procedureId;
DeleteDevicesProcedure procedure = null;
final TSStatus status;
synchronized (this) {
final Pair<Long, Boolean> procedureIdDuplicatePair =
checkDuplicateTableTask(
Expand DownExpand Up@@ -1898,9 +1903,11 @@ public TDeleteTableDeviceResp deleteDevices(
req.getModInfo(),
isGeneratedByPipe);
this.executor.submitProcedure(procedure);
status = waitingProcedureFinished(procedure);
} else {
status = waitingProcedureFinished(procedureId);
}
}
TSStatus status = waitingProcedureFinished(procedure);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return new TDeleteTableDeviceResp(StatusUtils.OK)
.setDeletedNum(
Expand DownExpand Up@@ -1932,6 +1939,8 @@ public TSStatus executeWithoutDuplicate(
"Some other task is operating table with same name.");
}
this.executor.submitProcedure(procedure);
} else {
return waitingProcedureFinished(procedureId);
}
}
return waitingProcedureFinished(procedure);
Expand Down