-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
HBASE-27111 Make Netty channel bytebuf allocator configurable. #4525
Merged
Merged
Changes from all commits
Commits
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
56 changes: 56 additions & 0 deletions
56
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HeapByteBufAllocator.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,56 @@ | ||
/* | ||
* 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.hadoop.hbase.ipc; | ||
|
||
import org.apache.yetus.audience.InterfaceAudience; | ||
|
||
import org.apache.hbase.thirdparty.io.netty.buffer.AbstractByteBufAllocator; | ||
import org.apache.hbase.thirdparty.io.netty.buffer.ByteBuf; | ||
import org.apache.hbase.thirdparty.io.netty.buffer.PooledByteBufAllocator; | ||
|
||
/** | ||
* A pooled ByteBufAllocator that does not prefer direct buffers regardless of platform settings. | ||
* <p> | ||
* In some cases direct buffers are still required, like IO buffers where the buffer will be used in | ||
* conjunction with a native method call, so we cannot force all buffer usage on heap. But we can | ||
* strongly prefer it. | ||
*/ | ||
@InterfaceAudience.Private | ||
public class HeapByteBufAllocator extends AbstractByteBufAllocator { | ||
|
||
public static final HeapByteBufAllocator DEFAULT = new HeapByteBufAllocator(); | ||
|
||
private final PooledByteBufAllocator delegate = | ||
new PooledByteBufAllocator(false /* preferDirect */); | ||
|
||
@Override | ||
public boolean isDirectBufferPooled() { | ||
return delegate.isDirectBufferPooled(); | ||
} | ||
|
||
@Override | ||
protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity) { | ||
return delegate.heapBuffer(initialCapacity, maxCapacity); | ||
} | ||
|
||
@Override | ||
protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity) { | ||
return delegate.directBuffer(initialCapacity, maxCapacity); | ||
} | ||
|
||
} |
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
52 changes: 52 additions & 0 deletions
52
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/SimpleByteBufAllocator.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,52 @@ | ||
/* | ||
* 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.hadoop.hbase.ipc; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import org.apache.hbase.thirdparty.io.netty.buffer.AbstractByteBufAllocator; | ||
import org.apache.hbase.thirdparty.io.netty.buffer.ByteBuf; | ||
import org.apache.hbase.thirdparty.io.netty.buffer.ByteBufAllocator; | ||
import org.apache.hbase.thirdparty.io.netty.buffer.Unpooled; | ||
|
||
/** | ||
* A custom byte buf allocator for TestNettyRpcServer. | ||
*/ | ||
public class SimpleByteBufAllocator extends AbstractByteBufAllocator implements ByteBufAllocator { | ||
|
||
static final Logger LOG = LoggerFactory.getLogger(SimpleByteBufAllocator.class); | ||
|
||
@Override | ||
public boolean isDirectBufferPooled() { | ||
return false; | ||
} | ||
|
||
@Override | ||
protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity) { | ||
LOG.info("newHeapBuffer initialCapacity={}, maxCapacity={}", initialCapacity, maxCapacity); | ||
return Unpooled.buffer(initialCapacity, maxCapacity); | ||
} | ||
|
||
@Override | ||
protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity) { | ||
LOG.info("newDirectBuffer initialCapacity={}, maxCapacity={}", initialCapacity, maxCapacity); | ||
return Unpooled.directBuffer(initialCapacity, maxCapacity); | ||
} | ||
|
||
} |
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
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.
Nice, this is good for debugging