-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
[improve][misc][WIP] Detect "double release" and "use after release" bugs with recycled objects #22110
Draft
lhotari
wants to merge
4
commits into
apache:master
Choose a base branch
from
lhotari:lh-detect-double-release-bugs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
[improve][misc][WIP] Detect "double release" and "use after release" bugs with recycled objects #22110
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
397b6d4
WIP Add checks for preventing hard-to-debug double release bugs with …
lhotari 373e343
refCnt starts at 1
lhotari dc3e1a9
Fix retain logic for ChunkedMessageCtx to match setRefCnt(totalChunks)
lhotari d59f9ab
Remove refCnt==0 check since object might be new or reused when it ge…
lhotari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,6 @@ | |
import static org.apache.pulsar.common.util.Runnables.catchingAndLoggingThrowables; | ||
import com.google.common.annotations.VisibleForTesting; | ||
import io.netty.buffer.ByteBuf; | ||
import io.netty.util.AbstractReferenceCounted; | ||
import io.netty.util.Recycler; | ||
import io.netty.util.Recycler.Handle; | ||
import io.netty.util.ReferenceCountUtil; | ||
|
@@ -92,6 +91,7 @@ | |
import org.apache.pulsar.common.protocol.schema.SchemaVersion; | ||
import org.apache.pulsar.common.schema.SchemaInfo; | ||
import org.apache.pulsar.common.schema.SchemaType; | ||
import org.apache.pulsar.common.util.AbstractValidatingReferenceCounted; | ||
import org.apache.pulsar.common.util.DateFormatter; | ||
import org.apache.pulsar.common.util.FutureUtil; | ||
import org.apache.pulsar.common.util.RelativeTimeUtil; | ||
|
@@ -1357,11 +1357,12 @@ protected boolean verifyLocalBufferIsNotCorrupted(OpSendMsg op) { | |
} | ||
} | ||
|
||
static class ChunkedMessageCtx extends AbstractReferenceCounted { | ||
static class ChunkedMessageCtx extends AbstractValidatingReferenceCounted { | ||
protected MessageIdImpl firstChunkMessageId; | ||
protected MessageIdImpl lastChunkMessageId; | ||
|
||
public ChunkMessageIdImpl getChunkMessageId() { | ||
checkRefCount(); | ||
return new ChunkMessageIdImpl(firstChunkMessageId, lastChunkMessageId); | ||
} | ||
|
||
|
@@ -1374,8 +1375,10 @@ protected ProducerImpl.ChunkedMessageCtx newObject( | |
}; | ||
|
||
public static ChunkedMessageCtx get(int totalChunks) { | ||
ChunkedMessageCtx chunkedMessageCtx = RECYCLER.get(); | ||
chunkedMessageCtx.setRefCnt(totalChunks); | ||
ChunkedMessageCtx chunkedMessageCtx = getAndCheck(RECYCLER); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is setting ref count to 1 and then retaining N-1 less performant than setting ref count to N? OR Is setting ref count to 1 and then retaining N-1 more functionally correct than setting ref count to N? |
||
if (totalChunks > 1) { | ||
chunkedMessageCtx.retain(totalChunks - 1); | ||
} | ||
return chunkedMessageCtx; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...ommon/src/main/java/org/apache/pulsar/common/util/AbstractValidatingReferenceCounted.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.pulsar.common.util; | ||
|
||
import io.netty.util.AbstractReferenceCounted; | ||
import io.netty.util.IllegalReferenceCountException; | ||
import io.netty.util.Recycler; | ||
|
||
public abstract class AbstractValidatingReferenceCounted extends AbstractReferenceCounted { | ||
private static final boolean refCountCheckOnAccess = | ||
Boolean.parseBoolean(System.getProperty("pulsar.refcount.check.on_access", "true")); | ||
/** | ||
* Validate that the instance hasn't been released before accessing fields. | ||
* This is a sanity check to ensure that we don't read fields from deallocated objects. | ||
*/ | ||
protected void checkRefCount() { | ||
if (refCountCheckOnAccess && refCnt() < 1) { | ||
throw new IllegalReferenceCountException( | ||
"Possible double release bug (refCnt=" + refCnt() + "). " + getClass().getSimpleName() | ||
+ " has been deallocated. "); | ||
} | ||
} | ||
|
||
public static <T extends AbstractReferenceCounted> T getAndCheck(Recycler<T> recycler) { | ||
T object = recycler.get(); | ||
if (object.refCnt() != 1) { | ||
throw new IllegalReferenceCountException(object.getClass().getSimpleName() | ||
+ " should be obtained from the recycler with refCnt == 1, (refCnt=" + object.refCnt() | ||
+ ") instance=" + object); | ||
} | ||
return object; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏻 factoring this out makes it easier to follow (and add other common behaviors in one place later if needed - basic DRY stuff).