Repository: ignite Updated Branches: refs/heads/ignite-1.9 7b9cd0711 -> 4eac51cee
IGNITE-4469: Hadoop: set default value of offheap memory page and shuffle messages to 1Mb. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/072b9c26 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/072b9c26 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/072b9c26 Branch: refs/heads/ignite-1.9 Commit: 072b9c26dda4eb7a39d095d33c08d1611c891444 Parents: d92b88f Author: devozerov <[email protected]> Authored: Wed Dec 21 13:08:30 2016 +0300 Committer: devozerov <[email protected]> Committed: Wed Dec 21 13:09:25 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/hadoop/HadoopJobProperty.java | 4 ++-- .../internal/processors/hadoop/shuffle/HadoopShuffleJob.java | 2 +- .../hadoop/shuffle/collections/HadoopMultimapBase.java | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/072b9c26/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java index 9dd430b..4398acd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java @@ -71,7 +71,7 @@ public enum HadoopJobProperty { /** * Size in bytes of single memory page which will be allocated for data structures in shuffle. * <p> - * By default is {@code 32 * 1024}. + * Defaults to {@code 1Mb}. */ SHUFFLE_OFFHEAP_PAGE_SIZE("ignite.shuffle.offheap.page.size"), @@ -98,7 +98,7 @@ public enum HadoopJobProperty { /** * Defines approximate size in bytes of shuffle message which will be passed over wire from mapper to reducer. * <p> - * Defaults to 128Kb. + * Defaults to {@code 1Mb}. */ SHUFFLE_MSG_SIZE("ignite.shuffle.message.size"), http://git-wip-us.apache.org/repos/asf/ignite/blob/072b9c26/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java index 214a335..1c546a1 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java @@ -76,7 +76,7 @@ import static org.apache.ignite.internal.processors.hadoop.HadoopJobProperty.get */ public class HadoopShuffleJob<T> implements AutoCloseable { /** */ - private static final int DFLT_SHUFFLE_MSG_SIZE = 128 * 1024; + private static final int DFLT_SHUFFLE_MSG_SIZE = 1024 * 1024; /** */ private final HadoopJob job; http://git-wip-us.apache.org/repos/asf/ignite/blob/072b9c26/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java index 39b7c51..d7a4541 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopMultimapBase.java @@ -40,6 +40,9 @@ import static org.apache.ignite.internal.processors.hadoop.HadoopJobProperty.get * Base class for all multimaps. */ public abstract class HadoopMultimapBase implements HadoopMultimap { + /** Default offheap page size. */ + private static final int DFLT_OFFHEAP_PAGE_SIZE = 1024 * 1024; + /** */ protected final GridUnsafeMemory mem; @@ -59,7 +62,7 @@ public abstract class HadoopMultimapBase implements HadoopMultimap { this.mem = mem; - pageSize = get(jobInfo, SHUFFLE_OFFHEAP_PAGE_SIZE, 32 * 1024); + pageSize = get(jobInfo, SHUFFLE_OFFHEAP_PAGE_SIZE, DFLT_OFFHEAP_PAGE_SIZE); } /**
