Skip to content

Pipe: Fixed the bug that the timeout ms is regarded as s #17590

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

Open
Caideyipi wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −3
Open

Pipe: Fixed the bug that the timeout ms is regarded as s #17590

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...ore/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ public void stopAllPipesWithCriticalExceptionAndTrackException(
///////////////////////// Heartbeat /////////////////////////

public void collectPipeMetaList(final TDataNodeHeartbeatResp resp) throws TException {
if (!tryReadLockWithTimeOut(
if (!tryReadLockWithTimeOutInMs(
CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS() * 2L / 3)) {
return;
}
Expand Down
16 changes: 14 additions & 2 deletions ...re/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ protected boolean tryReadLockWithTimeOut(final long timeOutInSeconds) {
}
}

protected boolean tryReadLockWithTimeOutInMs(final long timeOutInMs) {
return tryReadLockWithTimeOut(convertMsToCeilSeconds(timeOutInMs));
}

protected void releaseReadLock() {
pipeMetaKeeper.releaseReadLock();
}
Expand All @@ -148,10 +152,18 @@ protected boolean tryWriteLockWithTimeOut(final long timeOutInSeconds) {
}
}

protected boolean tryWriteLockWithTimeOutInMs(final long timeOutInMs) {
return tryWriteLockWithTimeOut(convertMsToCeilSeconds(timeOutInMs));
}

protected void releaseWriteLock() {
pipeMetaKeeper.releaseWriteLock();
}

private long convertMsToCeilSeconds(final long timeOutInMs) {
return Math.max(1L, (Math.max(0L, timeOutInMs) + 999L) / 1000L);
}

////////////////////////// Pipe Task Management Entry //////////////////////////

public TPushPipeMetaRespExceptionMessage handleSinglePipeMetaChanges(
Expand Down Expand Up @@ -368,7 +380,7 @@ protected TPushPipeMetaRespExceptionMessage handleDropPipeInternal(final String

public List<TPushPipeMetaRespExceptionMessage> handlePipeMetaChanges(
final List<PipeMeta> pipeMetaListFromCoordinator) {
if (!tryWriteLockWithTimeOut(
if (!tryWriteLockWithTimeOutInMs(
CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS() * 2L / 3)) {
return null;
}
Expand Down Expand Up @@ -1107,7 +1119,7 @@ private void stopAllPipesWithCriticalExceptionInternal(final int currentNodeId)

public void collectPipeMetaList(final TPipeHeartbeatReq req, final TPipeHeartbeatResp resp)
throws TException {
if (!tryReadLockWithTimeOut(
if (!tryReadLockWithTimeOutInMs(
CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS() * 2L / 3)) {
return;
}
Expand Down
Loading