LIVY-306. Removed hard-coded minimum timeout value. (#290) Currently a session timeout can't be configured below 1h. This is due to a hard-coded value that was missed in the clean up of LIVY-114 and LIVY-127.
Removed the limit and the conf value (default of 1h) will be used. Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/a72bbff6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/a72bbff6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/a72bbff6 Branch: refs/heads/master Commit: a72bbff6fbf961f7413f3ca87d2a244f182f98ff Parents: 14c29e4 Author: Alex Bozarth <ajboz...@us.ibm.com> Authored: Tue Feb 21 17:29:33 2017 -0800 Committer: Alex Man <tc.technet...@gmail.com> Committed: Tue Feb 21 17:29:33 2017 -0800 ---------------------------------------------------------------------- server/src/main/scala/com/cloudera/livy/sessions/Session.scala | 1 - .../src/main/scala/com/cloudera/livy/sessions/SessionManager.scala | 2 +- server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/a72bbff6/server/src/main/scala/com/cloudera/livy/sessions/Session.scala ---------------------------------------------------------------------- diff --git a/server/src/main/scala/com/cloudera/livy/sessions/Session.scala b/server/src/main/scala/com/cloudera/livy/sessions/Session.scala index faf3422..a0d0f8b 100644 --- a/server/src/main/scala/com/cloudera/livy/sessions/Session.scala +++ b/server/src/main/scala/com/cloudera/livy/sessions/Session.scala @@ -197,7 +197,6 @@ abstract class Session(val id: Int, val owner: String, val livyConf: LivyConf) } } - val timeout: Long = TimeUnit.HOURS.toNanos(1) override def toString(): String = s"${this.getClass.getSimpleName} $id" http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/a72bbff6/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala ---------------------------------------------------------------------- diff --git a/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala b/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala index 34aad1a..a50bd41 100644 --- a/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala +++ b/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala @@ -133,7 +133,7 @@ class SessionManager[S <: Session, R <: RecoveryMetadata : ClassTag]( def collectGarbage(): Future[Iterable[Unit]] = { def expired(session: Session): Boolean = { val currentTime = System.nanoTime() - currentTime - session.lastActivity > math.max(sessionTimeout, session.timeout) + currentTime - session.lastActivity > sessionTimeout } Future.sequence(all().filter(expired).map(delete)) http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/a72bbff6/server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala ---------------------------------------------------------------------- diff --git a/server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala b/server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala index dba60bf..c276a5e 100644 --- a/server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala +++ b/server/src/test/scala/com/cloudera/livy/sessions/MockSession.scala @@ -31,7 +31,5 @@ class MockSession(id: Int, owner: String, conf: LivyConf) extends Session(id, ow override def state: SessionState = SessionState.Idle() - override val timeout: Long = 0L - override def recoveryMetadata: RecoveryMetadata = RecoveryMetadata(0) }
