Repository: lens Updated Branches: refs/heads/master fcc0cafd6 -> c7a39bc93
Correcting description of lens.driver.jdbc.get.connection.timeout Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/c7a39bc9 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/c7a39bc9 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/c7a39bc9 Branch: refs/heads/master Commit: c7a39bc93d978f0273dc99e39bca89a1cd776845 Parents: fcc0caf Author: Puneet Gupta <puneet.k.gupta@gmaillcom> Authored: Fri Jun 3 17:59:00 2016 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Fri Jun 3 17:59:00 2016 +0530 ---------------------------------------------------------------------- lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml | 6 ++++-- src/site/apt/admin/jdbcdriver-config.apt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/c7a39bc9/lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml b/lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml index b446f7a..66645b9 100644 --- a/lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml +++ b/lens-driver-jdbc/src/main/resources/jdbcdriver-default.xml @@ -91,8 +91,10 @@ <property> <name>lens.driver.jdbc.get.connection.timeout</name> <value>10000</value> - <description>Response timeout in milliseconds of any JDBC call invoking data transmission over a connection socket - </description> + <description>The number of milliseconds a client calling getConnection() will wait for a Connection to be + checked-in or acquired when the pool is exhausted. Zero means wait indefinitely. Setting any positive value + will cause the getConnection () call to time-out and break with an SQLException after the specified number + of milliseconds. The default value of this property is 10 secs.</description> </property> <!-- Estimate query connection pool settings --> http://git-wip-us.apache.org/repos/asf/lens/blob/c7a39bc9/src/site/apt/admin/jdbcdriver-config.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/admin/jdbcdriver-config.apt b/src/site/apt/admin/jdbcdriver-config.apt index 8fd5295..96c98ad 100644 --- a/src/site/apt/admin/jdbcdriver-config.apt +++ b/src/site/apt/admin/jdbcdriver-config.apt @@ -70,7 +70,7 @@ Jdbc driver configuration *--+--+---+--+ |23|lens.driver.jdbc.fetch.size|1000|Fetch size for JDBC result set| *--+--+---+--+ -|24|lens.driver.jdbc.get.connection.timeout|10000|Response timeout in milliseconds of any JDBC call invoking data transmission over a connection socket| +|24|lens.driver.jdbc.get.connection.timeout|10000|The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted. Zero means wait indefinitely. Setting any positive value will cause the getConnection () call to time-out and break with an SQLException after the specified number of milliseconds. The default value of this property is 10 secs.| *--+--+---+--+ |25|lens.driver.jdbc.pool.idle.time|600|Maximum idle time in sec before a connection is closed| *--+--+---+--+