-
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
base: master
Are you sure you want to change the base?
[improve][misc][WIP] Detect "double release" and "use after release" bugs with recycled objects #22110
Changes from all commits
397b6d4
373e343
dc3e1a9
d59f9ab
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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; | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* 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 final void resetRefCnt() { | ||
setRefCnt(1); | ||
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. It is unfortunate that
Not the end of the world but my brain is having trouble leaving it alone. |
||
} | ||
|
||
public static <T extends AbstractValidatingReferenceCounted> T getAndCheck(Recycler<T> 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. [NIT] It is not really doing a "check". In the ACRC it was called |
||
T object = recycler.get(); | ||
object.resetRefCnt(); | ||
return object; | ||
} | ||
} |
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).