spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject spark git commit: [SPARK-14261][SQL] Memory leak in Spark Thrift Server
Date Fri, 20 May 2016 05:25:32 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 fd2da7b91 -> 7200e6b54


[SPARK-14261][SQL] Memory leak in Spark Thrift Server

Fixed memory leak (HiveConf in the CommandProcessorFactory)

Author: Oleg Danilov <oleg.danilov@wandisco.com>

Closes #12932 from dosoft/SPARK-14261.

(cherry picked from commit e384c7fbb94cef3c18e8fa8d06159b76b88b5167)
Signed-off-by: Reynold Xin <rxin@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7200e6b5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7200e6b5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7200e6b5

Branch: refs/heads/branch-1.6
Commit: 7200e6b544ded6c0a63175b20847958f2105c685
Parents: fd2da7b
Author: Oleg Danilov <oleg.danilov@wandisco.com>
Authored: Thu May 19 22:23:28 2016 -0700
Committer: Reynold Xin <rxin@databricks.com>
Committed: Thu May 19 22:25:25 2016 -0700

----------------------------------------------------------------------
 .../scala/org/apache/spark/sql/hive/client/ClientWrapper.scala     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7200e6b5/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/ClientWrapper.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/ClientWrapper.scala
b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/ClientWrapper.scala
index e9b2e20..075b4cb 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/ClientWrapper.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/ClientWrapper.scala
@@ -496,12 +496,14 @@ private[hive] class ClientWrapper(
           // Throw an exception if there is an error in query processing.
           if (response.getResponseCode != 0) {
             driver.close()
+            CommandProcessorFactory.clean(conf)
             throw new QueryExecutionException(response.getErrorMessage)
           }
           driver.setMaxRows(maxRows)
 
           val results = shim.getDriverResults(driver)
           driver.close()
+          CommandProcessorFactory.clean(conf)
           results
 
         case _ =>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message