Repository: flume Updated Branches: refs/heads/flume-1.6 b08242985 -> a7f030691
FLUME-2024. Add ExecSource flush timeout to Flume User Guide (Ashish Paliwal 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/a7f03069 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/a7f03069 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/a7f03069 Branch: refs/heads/flume-1.6 Commit: a7f0306919c1c7a80c7e0b586a93840cf9c0ec8e Parents: b082429 Author: Roshan Naik <[email protected]> Authored: Fri Jun 13 19:26:02 2014 -0700 Committer: Roshan Naik <[email protected]> Committed: Fri Jun 13 19:45:52 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/flume/source/ExecSource.java | 6 ++++++ flume-ng-doc/sphinx/FlumeUserGuide.rst | 1 + 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/a7f03069/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java index 1d8d267..18e662c 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java +++ b/flume-ng-core/src/main/java/org/apache/flume/source/ExecSource.java @@ -131,6 +131,12 @@ import java.nio.charset.Charset; * <td>integer</td> * <td>20</td> * </tr> + * <tr> + * <td><tt>batchTimeout</tt></td> + * <td>Amount of time (in milliseconds) to wait, if the buffer size was not reached, before data is pushed downstream.</td> + * <td>long</td> + * <td>3000</td> + * </tr> * </table> * <p> * <b>Metrics</b> http://git-wip-us.apache.org/repos/asf/flume/blob/a7f03069/flume-ng-doc/sphinx/FlumeUserGuide.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index 0e5e767..f0dd8e8 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -792,6 +792,7 @@ restartThrottle 10000 Amount of time (in millis) to wait before attempti restart false Whether the executed cmd should be restarted if it dies logStdErr false Whether the command's stderr should be logged batchSize 20 The max number of lines to read and send to the channel at a time +batchTimeout 3000 Amount of time (in milliseconds) to wait, if the buffer size was not reached, before data is pushed downstream selector.type replicating replicating or multiplexing selector.* Depends on the selector.type value interceptors -- Space-separated list of interceptors
