Skip to content

HDDS-8978. SCM SequenceIdGenerator#reinitialize only needs to acquire the lock once #5027

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
adoroszlai merged 3 commits into from
Jul 19, 2023
Merged

HDDS-8978. SCM SequenceIdGenerator#reinitialize only needs to acquire the lock once #5027

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9542e43
HDDS-8978. Deadlock in scm SequenceIdGenerator
guohao-rosicky Jul 6, 2023
7969a65
Merge branch 'apache:master' into guohao-HDDS-8978-dev
guohao-rosicky Jul 19, 2023
21c3195
change log
guohao-rosicky Jul 19, 2023
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
10 changes: 7 additions & 3 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SequenceIdGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,17 @@ public long getNextId(String sequenceIdName) throws SCMException {
public void invalidateBatch() {
lock.lock();
try {
sequenceIdToBatchMap.forEach(
(sequenceId, batch) -> batch.nextId = batch.lastId + 1);
invalidateBatchInternal();
} finally {
lock.unlock();
}
}

private void invalidateBatchInternal() {
sequenceIdToBatchMap
.forEach((sequenceId, batch) -> batch.nextId = batch.lastId + 1);
}

/**
* Reinitialize the SequenceIdGenerator with the latest sequenceIdTable
* during SCM reload.
Expand All @@ -177,7 +181,7 @@ public void reinitialize(Table<String, Long> sequenceIdTable)
lock.lock();
try {
LOG.info("reinitialize SequenceIdGenerator.");
Copy link
Contributor

@adoroszlai adoroszlai Jul 14, 2023

Choose a reason for hiding this comment

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

I think we should move the log statement out of the lock.

Copy link
Contributor Author

@guohao-rosicky guohao-rosicky Jul 14, 2023

Choose a reason for hiding this comment

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

sure.

invalidateBatch();
invalidateBatchInternal();
stateManager.reinitialize(sequenceIdTable);
} finally {
lock.unlock();
Expand Down