Repository: flume Updated Branches: refs/heads/flume-1.6 04f384576 -> cc13102a3
FLUME-2654. Clarify error message in MemoryChannel when byte capacity is reached. (Johny Rufus via Hari) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/cc13102a Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/cc13102a Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/cc13102a Branch: refs/heads/flume-1.6 Commit: cc13102a3ba8cb54d2d2c322a5ef149876382f28 Parents: 04f3845 Author: Hari Shreedharan <[email protected]> Authored: Tue Apr 7 13:18:32 2015 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Apr 7 13:19:33 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/flume/channel/MemoryChannel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/cc13102a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java index b84a3e0..6575d10 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java +++ b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java @@ -120,10 +120,10 @@ public class MemoryChannel extends BasicChannelSemantics { if(remainingChange < 0) { if(!bytesRemaining.tryAcquire(putByteCounter, keepAlive, TimeUnit.SECONDS)) { - throw new ChannelException("Cannot commit transaction. Heap space " + - "limit of " + byteCapacity + "reached. Please increase heap space" + - " allocated to the channel as the sinks may not be keeping up " + - "with the sources"); + throw new ChannelException("Cannot commit transaction. Byte capacity " + + "allocated to store event body " + byteCapacity * byteCapacitySlotSize + + "reached. Please increase heap space/byte capacity allocated to " + + "the channel as the sinks may not be keeping up with the sources"); } if(!queueRemaining.tryAcquire(-remainingChange, keepAlive, TimeUnit.SECONDS)) { bytesRemaining.release(putByteCounter);
