Repository: flume Updated Branches: refs/heads/trunk 9968f0fb0 -> 35cf90001
FLUME-2346. idLogFileMap in Log can lose track of file ids. (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/35cf9000 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/35cf9000 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/35cf9000 Branch: refs/heads/trunk Commit: 35cf900017a797e5ff3aedb01f05c88bb3f86ca0 Parents: 9968f0f Author: Hari Shreedharan <[email protected]> Authored: Thu Oct 9 16:10:10 2014 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Thu Oct 9 16:10:10 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/flume/channel/file/Log.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/35cf9000/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 5b581e1..e797797 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 @@ -1029,11 +1029,12 @@ public class Log { try { writer.markCheckpoint(logWriteOrderID); } finally { + reader = LogFileFactory.getRandomReader(file, + encryptionKeyProvider, fsyncPerTransaction); + idLogFileMap.put(id, reader); writer.close(); } - reader = LogFileFactory.getRandomReader(file, - encryptionKeyProvider, fsyncPerTransaction); - idLogFileMap.put(id, reader); + LOGGER.debug("Updated checkpoint for file: " + file + "logWriteOrderID " + logWriteOrderID); idIterator.remove();
