You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/06/27 06:39:09 UTC
[28/50] [abbrv] incubator-livy git commit: LIVY-326. Change Hadoop
dependencies to Apache Hadoop (#306)
LIVY-326. Change Hadoop dependencies to Apache Hadoop (#306)
* Change Hadoop dependencies to Apache Hadoop
Change-Id: I5500cc0061b03af1587700b7b0a7a147bbf0a333
* Change to use Apache Hadoop 2.7.3
Change-Id: Ied6a69e28fb4a9e4d1dcd97595c7ab253f1eaf82
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/fbccb694
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/fbccb694
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/fbccb694
Branch: refs/heads/master
Commit: fbccb694d2f4eda8b82323b64cba12eea95edfac
Parents: 70f23b9
Author: Saisai Shao <sa...@gmail.com>
Authored: Mon Mar 13 14:12:10 2017 +0800
Committer: Jeff Zhang <zj...@gmail.com>
Committed: Mon Mar 13 14:12:10 2017 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
.../src/main/scala/com/cloudera/livy/sessions/SessionManager.scala | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/fbccb694/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fbc4d84..cb6d80f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
</organization>
<properties>
- <hadoop.version>2.6.0-cdh5.5.0</hadoop.version>
+ <hadoop.version>2.7.3</hadoop.version>
<hadoop.scope>compile</hadoop.scope>
<spark.version>1.6.2</spark.version>
<commons-codec.version>1.9</commons-codec.version>
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/fbccb694/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 e177108..edf61c7 100644
--- a/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala
+++ b/server/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala
@@ -134,8 +134,6 @@ class SessionManager[S <: Session, R <: RecoveryMetadata : ClassTag](
def collectGarbage(): Future[Iterable[Unit]] = {
def expired(session: Session): Boolean = {
- val currentTime = System.nanoTime()
- currentTime - session.lastActivity > sessionTimeout
session.state match {
case s: FinishedSessionState =>
val currentTime = System.nanoTime()