GIRAPH-943: Perf regression due to netty 4.0.21 (pavanka)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/bc9f823e Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/bc9f823e Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/bc9f823e Branch: refs/heads/release-1.1 Commit: bc9f823e23d110d3c54d6eb0f5ccf7eff155a6b7 Parents: 181ce39 Author: Pavan Kumar <[email protected]> Authored: Tue Aug 12 14:09:48 2014 -0700 Committer: Pavan Kumar <[email protected]> Committed: Tue Aug 12 14:09:48 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../main/java/org/apache/giraph/conf/GiraphConfiguration.java | 5 +---- pom.xml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/bc9f823e/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 08abaaa..66136b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-943: Perf regression due to netty 4.0.21 (pavanka) + GIRAPH-935: Loosen modifiers when needed (ikabiljo via majakabiljo) GIRAPH-937 - Upgrade Hive I/O to 0.26. (aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/bc9f823e/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java index f35fbc1..7f1a764 100644 --- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java +++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java @@ -865,12 +865,9 @@ public class GiraphConfiguration extends Configuration */ public ByteBufAllocator getNettyAllocator() { if (nettyBufferAllocator == null) { - int nArenas = Math.max(GiraphConstants.NETTY_CLIENT_THREADS.get(this), - GiraphConstants.NETTY_SERVER_THREADS.get(this)); if (NETTY_USE_POOLED_ALLOCATOR.get(this)) { // Use pooled allocator nettyBufferAllocator = new PooledByteBufAllocator( - NETTY_USE_DIRECT_MEMORY.get(this), nArenas, nArenas, - 8192, 11, 0, 0, 0); + NETTY_USE_DIRECT_MEMORY.get(this)); } else { // Use un-pooled allocator // Note: Current default settings create un-pooled heap allocator nettyBufferAllocator = new UnpooledByteBufAllocator( http://git-wip-us.apache.org/repos/asf/giraph/blob/bc9f823e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ed2a98c..672ec44 100644 --- a/pom.xml +++ b/pom.xml @@ -308,7 +308,7 @@ under the License. <dep.mockito.version>1.9.5</dep.mockito.version> <!-- note: old version of netty is required by hadoop_facebook for tests to succeed --> <dep.oldnetty.version>3.2.2.Final</dep.oldnetty.version> - <dep.netty.version>4.0.21.Final</dep.netty.version> + <dep.netty.version>4.0.14.Final</dep.netty.version> <dep.paranamer.version>2.3</dep.paranamer.version> <dep.slf4j.version>1.7.5</dep.slf4j.version> <dep.tinkerpop.rexter.version>2.4.0</dep.tinkerpop.rexter.version>
