Revert "AMBARI-17074. Expose Spark daemon memory in Spark2 (Weiqing Yang via srimanth)"

This reverts commit 52dc9a693b7934503c179f650e0f6605f118d19a.

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml

@@ -59,17 +59,6 @@
     </value-attributes>
     <on-ambari-upgrade add="true"/>
   </property>
-  <property>
-    <name>spark_daemon_memory</name>
-    <value>1024</value>
-    <description>Memory for Master, Worker and history server (default: 1G)</description>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="false" change="true" delete="true"/>
-    <on-stack-upgrade add="true" change="true" delete="false"/>
-  </property>
   <!-- spark-env.sh -->
   <property>
     <name>content</name>
@@ -105,9 +94,6 @@ export SPARK_PID_DIR={{spark_pid_dir}}
 # A string representing this instance of spark.(Default: $USER)
 SPARK_IDENT_STRING=$USER
 
-#Memory for Master, Worker and history server (default: 1024MB)
-export SPARK_DAEMON_MEMORY={{spark_daemon_memory}}m
-
 # The scheduling priority for daemons. (Default: 0)
 SPARK_NICENESS=0
 

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py

@@ -69,7 +69,6 @@ if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE,
   spark_pid_dir = status_params.spark_pid_dir
   spark_home = format("{stack_root}/current/{component_directory}")
 
-spark_daemon_memory = config['configurations']['spark2-env']['spark_daemon_memory']
 spark_thrift_server_conf_file = spark_conf + "/spark-thrift-sparkconf.conf"
 java_home = config['hostLevelParams']['java_home']