Skip to content

HDDS-4024. Avoid while loop too soon when exception happen #1253

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
bshashikant merged 3 commits into from
Jul 29, 2020
Merged

HDDS-4024. Avoid while loop too soon when exception happen #1253

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db50e3
HDDS-4024. Avoid while loop too soon when exception happen
runzhiwang Jul 24, 2020
c89bc9d
fix code review
runzhiwang Jul 24, 2020
b2b9e81
triger ci
runzhiwang Jul 24, 2020
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
19 changes: 13 additions & 6 deletions ...main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,19 +224,26 @@ private void start() throws IOException {
nextHB.set(Time.monotonicNow() + heartbeatFrequency);
context.execute(executorService, heartbeatFrequency,
TimeUnit.MILLISECONDS);
now = Time.monotonicNow();
if (now < nextHB.get()) {
if(!Thread.interrupted()) {
Thread.sleep(nextHB.get() - now);
}
}
} catch (InterruptedException e) {
// Some one has sent interrupt signal, this could be because
// 1. Trigger heartbeat immediately
// 2. Shutdown has be initiated.
LOG.warn("Interrupt the execution.", e);
Thread.currentThread().interrupt();
} catch (Exception e) {
LOG.error("Unable to finish the execution.", e);
}

now = Time.monotonicNow();
if (now < nextHB.get()) {
if(!Thread.interrupted()) {
try {
Thread.sleep(nextHB.get() - now);
} catch (InterruptedException e) {
LOG.warn("Interrupt the execution.", e);
}
}
}
}

// If we have got some exception in stateMachine we set the state to
Expand Down