Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5b2660b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5b2660b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5b2660b Branch: refs/heads/trunk Commit: f5b2660bd8dcd08d4837d0ebc84cbb9b8c10236c Parents: 2db8bd5 5135905 Author: Benjamin Lerer <[email protected]> Authored: Mon Apr 11 10:00:33 2016 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Mon Apr 11 10:00:33 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b2660b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java index fc917d0,b488013..f2f258b --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@@ -265,9 -261,8 +265,9 @@@ public class CommitLog implements Commi int totalSize = size + ENTRY_OVERHEAD_SIZE; if (totalSize > MAX_MUTATION_SIZE) { - throw new IllegalArgumentException(String.format("Mutation of %s is too large for the maxiumum size of %s", - throw new IllegalArgumentException(String.format("Mutation of %s bytes is too large for the maximum size of %s", - totalSize, MAX_MUTATION_SIZE)); ++ throw new IllegalArgumentException(String.format("Mutation of %s is too large for the maximum size of %s", + FBUtilities.prettyPrintMemory(totalSize), + FBUtilities.prettyPrintMemory(MAX_MUTATION_SIZE))); } Allocation alloc = allocator.allocate(mutation, (int) totalSize);
