LIVY-326. Change Hadoop dependencies to Apache Hadoop (apache#306)

* Change Hadoop dependencies to Apache Hadoop Change-Id: I5500cc0061b03af1587700b7b0a7a147bbf0a333 * Change to use Apache Hadoop 2.7.3 Change-Id: Ied6a69e28fb4a9e4d1dcd97595c7ab253f1eaf82
nikolayvoronchikhin · Mar 13, 2017 · fbccb69 · fbccb69
1 parent 70f23b9
commit fbccb69
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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>

diff --git 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()