Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/5434b68c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/5434b68c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/5434b68c Branch: refs/heads/trunk Commit: 5434b68c6de9434bfd468fd69e81204f496e2bcf Parents: 25796ec e014030 Author: Juhani Connolly <[email protected]> Authored: Wed Aug 15 10:03:36 2012 +0900 Committer: Juhani Connolly <[email protected]> Committed: Wed Aug 15 10:03:36 2012 +0900 ---------------------------------------------------------------------- .../java/org/apache/flume/channel/file/Commit.java | 12 + .../org/apache/flume/channel/file/FileChannel.java | 17 +- .../channel/file/FileChannelConfiguration.java | 5 + .../apache/flume/channel/file/FlumeEventQueue.java | 52 ++- .../java/org/apache/flume/channel/file/Log.java | 50 ++- .../org/apache/flume/channel/file/LogFile.java | 74 ++++- .../org/apache/flume/channel/file/LogRecord.java | 70 ++++ .../java/org/apache/flume/channel/file/Put.java | 13 + .../apache/flume/channel/file/ReplayHandler.java | 153 +++++++- .../org/apache/flume/channel/file/Rollback.java | 10 + .../java/org/apache/flume/channel/file/Take.java | 14 + .../flume/channel/file/TransactionEventRecord.java | 14 +- .../flume/channel/file/TransactionIDOracle.java | 38 ++ .../flume/channel/file/WriteOrderOracle.java | 38 ++ .../apache/flume/channel/file/TestCheckpoint.java | 4 +- .../apache/flume/channel/file/TestFileChannel.java | 304 +++++++++++++-- .../org/apache/flume/channel/file/TestLog.java | 17 +- .../org/apache/flume/channel/file/TestLogFile.java | 6 +- .../apache/flume/channel/file/TestLogRecord.java | 71 ++++ .../channel/file/TestTransactionEventRecord.java | 18 +- .../channel/file/TestTransactionIDOracle.java | 36 ++ .../flume/channel/file/TestWriteOrderOracle.java | 36 ++ .../src/test/resources/fileformat-v2-checkpoint.gz | Bin 0 -> 143 bytes .../src/test/resources/fileformat-v2-log-1.gz | Bin 0 -> 26573 bytes .../src/test/resources/fileformat-v2-log-2.gz | Bin 0 -> 26637 bytes .../src/test/resources/fileformat-v2-log-3.gz | Bin 0 -> 26548 bytes .../fileformat-v2-pre-FLUME-1432-checkpoint.gz | Bin 0 -> 133 bytes .../fileformat-v2-pre-FLUME-1432-log-1.gz | Bin 0 -> 1338 bytes .../fileformat-v2-pre-FLUME-1432-log-2.gz | Bin 0 -> 1330 bytes .../fileformat-v2-pre-FLUME-1432-log-3.gz | Bin 0 -> 1345 bytes flume-ng-core/pom.xml | 5 + .../org/apache/flume/channel/MemoryChannel.java | 2 + .../flume/channel/PseudoTxnMemoryChannel.java | 32 ++- .../flume/instrumentation/ChannelCounter.java | 14 +- .../flume/instrumentation/ChannelCounterMBean.java | 11 + .../flume/instrumentation/GangliaServer.java | 70 ++--- .../instrumentation/MonitoredCounterGroup.java | 4 + .../flume/instrumentation/MonitoringType.java | 3 +- .../flume/instrumentation/SinkCounterMBean.java | 9 + .../flume/instrumentation/SourceCounterMBean.java | 10 +- .../instrumentation/http/HTTPMetricsServer.java | 128 ++++++ .../flume/instrumentation/util/JMXPollUtil.java | 84 ++++ .../serialization/EventSerializerFactory.java | 19 +- .../http/TestHTTPMetricsServer.java | 130 ++++++ .../flume/instrumentation/util/JMXTestUtils.java | 38 ++ .../instrumentation/util/TestJMXPollUtil.java | 87 ++++ flume-ng-doc/sphinx/FlumeUserGuide.rst | 50 +++ .../flume/sink/hbase/TestAsyncHBaseSink.java | 4 +- pom.xml | 7 + 49 files changed, 1570 insertions(+), 189 deletions(-) ----------------------------------------------------------------------
