Repository: flume Updated Branches: refs/heads/flume-1.6 fdb51b2af -> 6ad8adae6
FLUME-2480. Typo in file channel exception: "Usable space exhaused" (Santiago M. Mola via Roshan Naik) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/6ad8adae Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/6ad8adae Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/6ad8adae Branch: refs/heads/flume-1.6 Commit: 6ad8adae6873869e7ef97ea5f1bb79c409055811 Parents: fdb51b2 Author: Roshan Naik <[email protected]> Authored: Wed Nov 19 20:14:11 2014 -0800 Committer: Roshan Naik <[email protected]> Committed: Wed Nov 19 20:14:11 2014 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/flume/channel/file/Log.java | 10 +++++----- .../test/java/org/apache/flume/channel/file/TestLog.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/6ad8adae/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java index e797797..0e9171e 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java @@ -624,7 +624,7 @@ public class Log { long usableSpace = logFiles.get(logFileIndex).getUsableSpace(); long requiredSpace = minimumRequiredSpace + buffer.limit(); if(usableSpace <= requiredSpace) { - throw new IOException("Usable space exhaused, only " + usableSpace + + throw new IOException("Usable space exhausted, only " + usableSpace + " bytes remaining, required " + requiredSpace + " bytes"); } boolean error = true; @@ -667,7 +667,7 @@ public class Log { long usableSpace = logFiles.get(logFileIndex).getUsableSpace(); long requiredSpace = minimumRequiredSpace + buffer.limit(); if(usableSpace <= requiredSpace) { - throw new IOException("Usable space exhaused, only " + usableSpace + + throw new IOException("Usable space exhausted, only " + usableSpace + " bytes remaining, required " + requiredSpace + " bytes"); } boolean error = true; @@ -709,7 +709,7 @@ public class Log { long usableSpace = logFiles.get(logFileIndex).getUsableSpace(); long requiredSpace = minimumRequiredSpace + buffer.limit(); if(usableSpace <= requiredSpace) { - throw new IOException("Usable space exhaused, only " + usableSpace + + throw new IOException("Usable space exhausted, only " + usableSpace + " bytes remaining, required " + requiredSpace + " bytes"); } boolean error = true; @@ -866,7 +866,7 @@ public class Log { long usableSpace = logFiles.get(logFileIndex).getUsableSpace(); long requiredSpace = minimumRequiredSpace + buffer.limit(); if(usableSpace <= requiredSpace) { - throw new IOException("Usable space exhaused, only " + usableSpace + + throw new IOException("Usable space exhausted, only " + usableSpace + " bytes remaining, required " + requiredSpace + " bytes"); } boolean error = true; @@ -982,7 +982,7 @@ public class Log { boolean checkpointCompleted = false; long usableSpace = checkpointDir.getUsableSpace(); if(usableSpace <= minimumRequiredSpace) { - throw new IOException("Usable space exhaused, only " + usableSpace + + throw new IOException("Usable space exhausted, only " + usableSpace + " bytes remaining, required " + minimumRequiredSpace + " bytes"); } lockExclusive(); http://git-wip-us.apache.org/repos/asf/flume/blob/6ad8adae/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java index c9a64ed..f7f1afa 100644 --- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java +++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java @@ -168,7 +168,7 @@ public class TestLog { Assert.fail(); } catch (IOException e) { Assert.assertTrue(e.getMessage(), e.getMessage() - .startsWith("Usable space exhaused")); + .startsWith("Usable space exhausted")); } } /** @@ -214,7 +214,7 @@ public class TestLog { Assert.fail(); } catch (IOException e) { Assert.assertTrue(e.getMessage(), e.getMessage() - .startsWith("Usable space exhaused")); + .startsWith("Usable space exhausted")); } } /**
