AMBARI-11171 - Ambari should add the configurations to enable timeline service state preserving restart

ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml

@@ -277,6 +277,25 @@
       Enable age off of timeline store data.
     </description>
   </property>
+
+  <property>
+    <name>yarn.timeline-service.recovery.enabled</name>
+    <value>false</value>
+    <description>Enable timeline server to recover state after starting. If
+      true, then yarn.timeline-service.state-store-class must be specified.
+    </description>
+  </property>
+  <property>
+    <name>yarn.timeline-service.state-store-class</name>
+    <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value>
+    <description>Store class name for timeline state store.</description>
+  </property>
+  <property>
+    <name>yarn.timeline-service.leveldb-state-store.path</name>
+    <value>/hadoop/yarn/timeline</value>
+    <description>Store file name for leveldb state store.</description>
+  </property>
+
   <property>
     <name>yarn.timeline-service.leveldb-timeline-store.path</name>
     <value>/hadoop/yarn/timeline</value>

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml

@@ -393,17 +393,6 @@
             <key>yarn.timeline-service.recovery.enabled</key>
             <value>true</value>
           </task>
-
-          <task xsi:type="configure">
-            <type>yarn-site</type>
-            <transfer operation="copy" from-key="yarn.timeline-service.leveldb-timeline-store.path" to-key="yarn.timeline-service.leveldb-state-store.path"/>
-          </task>
-
-          <task xsi:type="configure">
-            <type>yarn-site</type>
-            <key>yarn.timeline-service.state-store-class</key>
-            <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value>
-          </task>
         </pre-upgrade>
 
         <upgrade>
@@ -436,6 +425,7 @@
         </upgrade>
       </component>
     </service>
+
     <service name="HBASE">
       <component name="HBASE_MASTER">
         <upgrade>

ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml

@@ -26,4 +26,9 @@
     <deleted>true</deleted>
   </property>
 
+  <property>
+    <name>yarn.timeline-service.recovery.enabled</name>
+    <value>true</value>
+  </property>
+
 </configuration>