Merge pull request apache#150 from schintap/YSPARK-537-cherry-pick-2.1

YSPARK-537 cherry pick to 2.1

Author: Tom Graves

yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala

@@ -73,6 +73,9 @@ private[spark] class Client(
 
   private val isClusterMode = sparkConf.get("spark.submit.deployMode", "client") == "cluster"
 
+  // Default java opts for driver
+  private val DEFAULT_DRIVER_JAVA_OPTS = "-XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
   // AM related configurations
   private val amMemory = if (isClusterMode) {
     sparkConf.get(DRIVER_MEMORY).toInt
@@ -959,7 +962,9 @@ private[spark] class Client(
         "-Djava.net.preferIPv4Stack=true")
       javaOpts ++= Utils.splitCommandString(adminOpts).map(YarnSparkHadoopUtil.escapeForShell)
 
-      val driverOpts = sparkConf.get(DRIVER_JAVA_OPTIONS).orElse(sys.env.get("SPARK_JAVA_OPTS"))
+      val driverOpts = sparkConf.get(DRIVER_JAVA_OPTIONS)
+                         .orElse(sys.env.get("SPARK_JAVA_OPTS"))
+                         .orElse(Some(DEFAULT_DRIVER_JAVA_OPTS))
       driverOpts.foreach { opts =>
         javaOpts ++= Utils.splitCommandString(opts).map(YarnSparkHadoopUtil.escapeForShell)
       }

yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala

@@ -59,6 +59,9 @@ private[yarn] class ExecutorRunnable(
   var rpc: YarnRPC = YarnRPC.create(conf)
   var nmClient: NMClient = _
 
+  // Default executor java opts for driver
+  private val DEFAULT_EXECUTOR_JAVA_OPTS = "-XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
   def run(): Unit = {
     logDebug("Starting Executor Container")
     nmClient = NMClient.createNMClient()
@@ -146,7 +149,7 @@ private[yarn] class ExecutorRunnable(
     javaOpts ++= Utils.splitCommandString(adminOpts).map(YarnSparkHadoopUtil.escapeForShell)
 
     // Set extra Java options for the executor, if defined
-    sparkConf.get(EXECUTOR_JAVA_OPTIONS).foreach { opts =>
+    sparkConf.get(EXECUTOR_JAVA_OPTIONS).orElse(Some(DEFAULT_EXECUTOR_JAVA_OPTS)).foreach { opts =>
       javaOpts ++= Utils.splitCommandString(opts).map(YarnSparkHadoopUtil.escapeForShell)
     }
     sys.env.get("SPARK_JAVA_OPTS").foreach { opts =>