Skip to content

[improve][broker]Use cursor.isActive instead to judge if cursor is active #19159

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
gaozhangmin merged 1 commit into from
Jan 11, 2023
Merged

[improve][broker]Use cursor.isActive instead to judge if cursor is active #19159

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 managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3663,7 +3663,7 @@ Pair<PositionImpl, Long> getFirstPositionAndCounter() {

public void activateCursor(ManagedCursor cursor) {
synchronized (activeCursors) {
if (activeCursors.get(cursor.getName()) == null) {
if (!cursor.isActive()) {

@Technoboy- Technoboy- Jan 10, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If change like this, I think it's better like

if (!cursor.isActive()) {
   Position positionForOrdering = config.isCacheEvictionByMarkDeletedPosition()
                        ? cursor.getMarkDeletedPosition()
                        : cursor.getReadPosition();
     if (positionForOrdering == null) {
             positionForOrdering = PositionImpl.EARLIEST;
     }
     synchronized (activeCursors) {
          activeCursors.add(cursor, positionForOrdering);
     }
}

@michaeljmarshall michaeljmarshall Jan 11, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just for reference, this change ultimately relies on a call to this method:

pulsar/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java

Lines 3695 to 3697 in 3bb93cb

public boolean isCursorActive(ManagedCursor cursor) {
return activeCursors.get(cursor.getName()) != null;
}

We don't want to change the scope of the synchronized block, as far as I can tell.

@michaeljmarshall michaeljmarshall Jan 11, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If any refactoring were to be made, I think we should have switched to use the ManagedLedgerImpl#isCursorActive method.

Position positionForOrdering = config.isCacheEvictionByMarkDeletedPosition()
? cursor.getMarkDeletedPosition()
: cursor.getReadPosition();
Expand Down