Updated Branches: refs/heads/flume-1.4 fc53e9ae2 -> 1ad702d29
FLUME-1774: EventBackingStoreFactory error message asks user to delete checkpoint which is now done automatically (Hari Shreedharan via Brock Noland) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/1ad702d2 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/1ad702d2 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/1ad702d2 Branch: refs/heads/flume-1.4 Commit: 1ad702d29bcaa40b79674988527995bea7d33242 Parents: fc53e9a Author: Brock Noland <[email protected]> Authored: Mon Dec 10 15:28:21 2012 -0600 Committer: Brock Noland <[email protected]> Committed: Mon Dec 10 15:28:35 2012 -0600 ---------------------------------------------------------------------- .../file/EventQueueBackingStoreFactory.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/1ad702d2/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java index faec50b..a19bdb4 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFactory.java @@ -51,9 +51,9 @@ class EventQueueBackingStoreFactory { + " exists but checkpoint does not. Checkpoint = " + checkpointFile + ", metaDataFile = " + metaDataFile); throw new BadCheckpointException( - "The last checkpoint was not completed correctly. " - + "Please delete all files in the checkpoint directory: " - + checkpointFile.getParentFile()); + "The last checkpoint was not completed correctly, " + + "since Checkpoint file does not exist while metadata " + + "file does."); } } // brand new, use v3
