Skip to content

[HUDI-7148] Add an additional fix to the potential thread insecurity problem of heartbeat client. #10188

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
danny0405 merged 1 commit into from
Nov 29, 2023
Merged

[HUDI-7148] Add an additional fix to the potential thread insecurity problem of heartbeat client. #10188

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
5 changes: 5 additions & 0 deletions ...i-client-common/src/main/java/org/apache/hudi/client/heartbeat/HoodieHeartbeatClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ private void updateHeartbeat(String instantTime) throws HoodieHeartbeatException
heartbeat.setLastHeartbeatTime(newHeartbeatTime);
heartbeat.setNumHeartbeats(heartbeat.getNumHeartbeats() + 1);
} catch (IOException io) {
Boolean isHeartbeatStopped = instantToHeartbeatMap.get(instantTime).isHeartbeatStopped;
if (isHeartbeatStopped) {
LOG.warn(String.format("update heart beat failed, because the instant time %s was stopped ? : %s", instantTime, isHeartbeatStopped));
return;
}
Copy link
Contributor

@nsivabalan nsivabalan Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to write a test for this?

Copy link
Contributor Author

@eric9204 eric9204 Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nsivabalan
It is difficult that the asynchronous heartbeat Timer task thread sends a request to update the heartbeat file to hdfs when the write client stops the heartbeat.
I can only write a similar unit test as follows. Do you have any suggestions?

@Test
  public void testUpdateStoppedHeartbeat() {

    HoodieHeartbeatClient hoodieHeartbeatClient =

        new HoodieHeartbeatClient(metaClient.getFs(), metaClient.getBasePath(), heartBeatInterval, numTolerableMisses);

    hoodieHeartbeatClient.start(instantTime1);

    hoodieHeartbeatClient.stopHeartbeatTimers();

    assertDoesNotThrow(() -> hoodieHeartbeatClient.updateHeartbeat(instantTime1));
  }

throw new HoodieHeartbeatException("Unable to generate heartbeat for instant " + instantTime, io);
}
}
Expand Down