GIRAPH-923: Upgrade Netty version to a latest stable one (pavanka)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/666d5fdd Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/666d5fdd Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/666d5fdd Branch: refs/heads/release-1.1 Commit: 666d5fdd966c5111316519a862336144223652ba Parents: 441ec8b Author: Pavan Kumar <[email protected]> Authored: Mon Jul 7 16:31:29 2014 -0700 Committer: Pavan Kumar <[email protected]> Committed: Mon Jul 7 16:31:29 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../main/java/org/apache/giraph/conf/GiraphConfiguration.java | 5 ++++- pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/666d5fdd/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 2929c66..43aea7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-923: Upgrade Netty version to a latest stable one (pavanka) + GIRAPH-916: Wrong number of vertices stored reported to command line (majakabiljo) GIRAPH-919: Add worker to worker communication (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/666d5fdd/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 b6384dc..ee88b04 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 @@ -854,9 +854,12 @@ 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)); + NETTY_USE_DIRECT_MEMORY.get(this), nArenas, nArenas, + 8192, 11, 0, 0, 0); } 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/666d5fdd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 183f2df..de25499 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.14.Final</dep.netty.version> + <dep.netty.version>4.0.21.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>
