Skip to content

Commit

Permalink
Avoid adding duplicated BrokerEntryMetadata (apache#12018)
Browse files Browse the repository at this point in the history
### Motivation

When the Pulsar cluster enables broker entry metadata, sometimes there're some corrupted entries. See streamnative/kop#442 for example. It's because the broker entry metadata has been added twice.

This bug might be introduced from apache#9039 https://github.com/apache/pulsar/blob/9b7c3275c904ac1e6a8ef67487a10a0506bb2c58/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java#L1516-L1518

It happened during a managed ledger's rollover while there're some pending `OpAddEntry`s in `updateLedgersIdsComplete`, only the ledger id should be updated and the data of `OpAddEntry` should not be modified.

### Modifications

Only call `beforeAddEntry` for once at the beginning of `internalAsyncAddEntry`.

(cherry picked from commit 9d44617)
  • Loading branch information
BewareMyPower authored and eolivelli committed Oct 19, 2021
1 parent 0e95a1a commit 3cc06b5
Showing 1 changed file with 5 additions and 7 deletions.
Expand Up @@ -713,6 +713,9 @@ public void asyncAddEntry(ByteBuf buffer, int numberOfMessages, AddEntryCallback
}

private synchronized void internalAsyncAddEntry(OpAddEntry addOperation) {
if (!beforeAddEntry(addOperation)) {
return;
}
pendingAddEntries.add(addOperation);
final State state = STATE_UPDATER.get(this);
if (state == State.Fenced) {
Expand Down Expand Up @@ -775,10 +778,7 @@ private synchronized void internalAsyncAddEntry(OpAddEntry addOperation) {
addOperation.setCloseWhenDone(true);
STATE_UPDATER.set(this, State.ClosingLedger);
}
// interceptor entry before add to bookie
if (beforeAddEntry(addOperation)) {
addOperation.initiate();
}
addOperation.initiate();
}
}

Expand Down Expand Up @@ -1508,9 +1508,7 @@ public synchronized void updateLedgersIdsComplete(Stat stat) {
ReferenceCountUtil.release(existsOp.data);
}
existsOp.setLedger(currentLedger);
if (beforeAddEntry(existsOp)) {
pendingAddEntries.add(existsOp);
}
pendingAddEntries.add(existsOp);
}
} while (existsOp != null && --pendingSize > 0);

Expand Down

0 comments on commit 3cc06b5

Please sign in to comment.