Skip to content

[To dev/1.3] Pipe: Avoid throwing null pointer during Close process (#16391) #16402

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
Caideyipi merged 1 commit into from
Sep 12, 2025
Merged

[To dev/1.3] Pipe: Avoid throwing null pointer during Close process (#16391) #16402

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: 2 additions & 0 deletions ...de/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeSyncClientManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public Pair<IoTDBSyncClient, Boolean> getClient(final String deviceId) {
&& endPoint != null
&& endPoint2ClientAndStatus.containsKey(endPoint)
&& Boolean.TRUE.equals(endPoint2ClientAndStatus.get(endPoint).getRight())
&& endPoint2ClientAndStatus.get(endPoint).getLeft() != null
? endPoint2ClientAndStatus.get(endPoint)
: getClient();
}
Expand All @@ -102,6 +103,7 @@ public Pair<IoTDBSyncClient, Boolean> getClient(final TEndPoint endPoint) {
&& endPoint != null
&& endPoint2ClientAndStatus.containsKey(endPoint)
&& Boolean.TRUE.equals(endPoint2ClientAndStatus.get(endPoint).getRight())
&& endPoint2ClientAndStatus.get(endPoint).getLeft() != null
? endPoint2ClientAndStatus.get(endPoint)
: getClient();
}
Expand Down
16 changes: 8 additions & 8 deletions ...mmons/src/main/java/org/apache/iotdb/commons/pipe/sink/client/IoTDBSyncClientManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void checkClientStatusAndTryReconstructIfNecessary() {
// Check whether any clients are available, if any client is available, return directly
for (final Pair<IoTDBSyncClient, Boolean> clientAndStatus :
endPoint2ClientAndStatus.values()) {
if (Boolean.TRUE.equals(clientAndStatus.getRight())) {
if (Boolean.TRUE.equals(clientAndStatus.getRight()) && clientAndStatus.getLeft() != null) {
return;
}
}
Expand All @@ -128,7 +128,7 @@ public void checkClientStatusAndTryReconstructIfNecessary() {
// Reconstruct all dead clients
for (final Map.Entry<TEndPoint, Pair<IoTDBSyncClient, Boolean>> entry :
endPoint2ClientAndStatus.entrySet()) {
if (Boolean.TRUE.equals(entry.getValue().getRight())) {
if (Boolean.TRUE.equals(entry.getValue().getRight()) && entry.getValue().getLeft() != null) {
continue;
}

Expand All @@ -137,7 +137,7 @@ public void checkClientStatusAndTryReconstructIfNecessary() {

// Check whether any clients are available
for (final Pair<IoTDBSyncClient, Boolean> clientAndStatus : endPoint2ClientAndStatus.values()) {
if (Boolean.TRUE.equals(clientAndStatus.getRight())) {
if (Boolean.TRUE.equals(clientAndStatus.getRight()) && clientAndStatus.getLeft() != null) {
lastCheckClientStatusTimestamp = System.currentTimeMillis();
return;
}
Expand Down Expand Up @@ -304,7 +304,6 @@ public void close() {
try {
if (clientAndStatus.getLeft() != null) {
clientAndStatus.getLeft().close();
clientAndStatus.setLeft(null);
}
LOGGER.info("Client {}:{} closed.", endPoint.getIp(), endPoint.getPort());
} catch (Exception e) {
Expand Down Expand Up @@ -335,7 +334,7 @@ public Pair<IoTDBSyncClient, Boolean> getClient() {
final int clientIndex = (int) (currentClientIndex++ % clientSize);
final Pair<IoTDBSyncClient, Boolean> clientAndStatus =
endPoint2ClientAndStatus.get(endPointList.get(clientIndex));
if (Boolean.TRUE.equals(clientAndStatus.getRight())) {
if (Boolean.TRUE.equals(clientAndStatus.getRight()) && clientAndStatus.getLeft() != null) {
return clientAndStatus;
}
}
Expand All @@ -352,7 +351,7 @@ public Pair<IoTDBSyncClient, Boolean> getClient() {
final int clientIndex = (int) (Math.random() * clientSize);
final Pair<IoTDBSyncClient, Boolean> clientAndStatus =
endPoint2ClientAndStatus.get(endPointList.get(clientIndex));
if (Boolean.TRUE.equals(clientAndStatus.getRight())) {
if (Boolean.TRUE.equals(clientAndStatus.getRight()) && clientAndStatus.getLeft() != null) {
return clientAndStatus;
}

Expand All @@ -361,7 +360,8 @@ public Pair<IoTDBSyncClient, Boolean> getClient() {
final int nextClientIndex = (clientIndex + tryCount + 1) % clientSize;
final Pair<IoTDBSyncClient, Boolean> nextClientAndStatus =
endPoint2ClientAndStatus.get(endPointList.get(nextClientIndex));
if (Boolean.TRUE.equals(nextClientAndStatus.getRight())) {
if (Boolean.TRUE.equals(nextClientAndStatus.getRight())
&& clientAndStatus.getLeft() != null) {
return nextClientAndStatus;
}
}
Expand All @@ -378,7 +378,7 @@ public Pair<IoTDBSyncClient, Boolean> getClient() {
for (final TEndPoint endPoint : endPointList) {
final Pair<IoTDBSyncClient, Boolean> clientAndStatus =
endPoint2ClientAndStatus.get(endPoint);
if (Boolean.TRUE.equals(clientAndStatus.getRight())) {
if (Boolean.TRUE.equals(clientAndStatus.getRight()) && clientAndStatus.getLeft() != null) {
return clientAndStatus;
}
}
Expand Down
Loading