Updated Branches: refs/heads/trunk 329af80d6 -> ae3d29faa
GIRAPH-516: out-of-core messages dies for ArrayIndexOutOfBoundsException when running out-of-core messages in UnsafeByteArrayOutputStream (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/ae3d29fa Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/ae3d29fa Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/ae3d29fa Branch: refs/heads/trunk Commit: ae3d29faac48338d3af8481f449db62bdf4d6c15 Parents: 329af80 Author: Maja Kabiljo <[email protected]> Authored: Thu Feb 14 14:37:23 2013 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Thu Feb 14 14:37:23 2013 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../comm/messages/DiskBackedMessageStore.java | 8 +++++--- .../org/apache/giraph/conf/GiraphConstants.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/ae3d29fa/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 6cc512b..1db3492 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-516: out-of-core messages dies for ArrayIndexOutOfBoundsException when + running out-of-core messages in UnsafeByteArrayOutputStream (majakabiljo) GIRAPH-513: OnDiskPartitionStore should take advantage of multiple disks (claudio) http://git-wip-us.apache.org/repos/asf/giraph/blob/ae3d29fa/giraph-core/src/main/java/org/apache/giraph/comm/messages/DiskBackedMessageStore.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/messages/DiskBackedMessageStore.java b/giraph-core/src/main/java/org/apache/giraph/comm/messages/DiskBackedMessageStore.java index 5684990..26abb94 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/messages/DiskBackedMessageStore.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/messages/DiskBackedMessageStore.java @@ -114,9 +114,11 @@ public class DiskBackedMessageStore<I extends WritableComparable, } } - for (M message : messages) { - message.write(extendedDataOutput); - numberOfMessagesInMemory.getAndIncrement(); + synchronized (extendedDataOutput) { + for (M message : messages) { + message.write(extendedDataOutput); + numberOfMessagesInMemory.getAndIncrement(); + } } } finally { rwLock.readLock().unlock(); http://git-wip-us.apache.org/repos/asf/giraph/blob/ae3d29fa/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java index 415009c..44d09c9 100644 --- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java +++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java @@ -528,7 +528,7 @@ public interface GiraphConstants { /** * Comma-separated list of directories in the local filesystem for - * out-of-core partitions. + * out-of-core partitions. */ String PARTITIONS_DIRECTORY = "giraph.partitionsDirectory"; /** Default directory for out-of-core partitions. */
