Index: service/src/java/org/apache/hive/service/server/HiveServer2.java =================================================================== --- service/src/java/org/apache/hive/service/server/HiveServer2.java (revision 1676808) +++ service/src/java/org/apache/hive/service/server/HiveServer2.java (working copy) @@ -38,6 +38,7 @@ import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.hadoop.hive.common.LogUtils; import org.apache.hadoop.hive.common.LogUtils.LogInitializationException; +import org.apache.hadoop.hive.common.ServerUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.exec.spark.session.SparkSessionManagerImpl; @@ -317,7 +318,9 @@ maxAttempts = hiveConf.getLongVar(HiveConf.ConfVars.HIVE_SERVER2_MAX_START_ATTEMPTS); HiveServer2 server = null; try { - server = new HiveServer2(); + // Cleanup the scratch dir before starting + ServerUtils.cleanUpScratchDir(hiveConf); + server = new HiveServer2(); server.init(hiveConf); server.start(); startPauseMonitor(hiveConf);