From 79c0961fe72c04781a2dbbfbf1614e7153846829 Mon Sep 17 00:00:00 2001
From: Sergey Reshetnyak <sreshetniak@mirantis.com>
Date: Wed, 16 Jul 2014 14:13:08 +0400
Subject: [PATCH] Bump Hadoop to 2.4.1 version

Change-Id: I8f742c472a20650f8c7f2a01bcaefb6eff232123
---
 MANIFEST.in                                            |  2 +-
 sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/__init__.py  |  0
 .../vanilla/{v2_4_0 => v2_4_1}/config_helper.py        | 10 +++++-----
 .../vanilla/{v2_4_0 => v2_4_1}/resources/README.rst    | 10 +++++-----
 .../{v2_4_0 => v2_4_1}/resources/core-default.xml      |  0
 .../{v2_4_0 => v2_4_1}/resources/hdfs-default.xml      |  0
 .../{v2_4_0 => v2_4_1}/resources/mapred-default.xml    |  0
 .../{v2_4_0 => v2_4_1}/resources/oozie-default.xml     |  0
 .../{v2_4_0 => v2_4_1}/resources/yarn-default.xml      |  6 +++---
 .../vanilla/{v2_4_0 => v2_4_1}/versionhandler.py       |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/__init__.py (100%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/config_helper.py (88%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/README.rst (80%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/core-default.xml (100%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/hdfs-default.xml (100%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/mapred-default.xml (100%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/oozie-default.xml (100%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/resources/yarn-default.xml (99%)
 rename sahara/plugins/vanilla/{v2_4_0 => v2_4_1}/versionhandler.py (98%)

diff --git a/MANIFEST.in b/MANIFEST.in
index b11bb3ff..96f54985 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,7 +16,7 @@ include sahara/plugins/vanilla/v1_2_1/resources/*.sh
 include sahara/plugins/vanilla/v1_2_1/resources/*.sql
 include sahara/plugins/vanilla/v1_2_1/resources/*.xml
 include sahara/plugins/vanilla/v2_3_0/resources/*.xml
-include sahara/plugins/vanilla/v2_4_0/resources/*.xml
+include sahara/plugins/vanilla/v2_4_1/resources/*.xml
 include sahara/plugins/hdp/versions/version_1_3_2/resources/*.template
 include sahara/plugins/hdp/versions/version_1_3_2/resources/*.json
 include sahara/plugins/hdp/versions/version_1_3_2/resources/*.sh
diff --git a/sahara/plugins/vanilla/v2_4_0/__init__.py b/sahara/plugins/vanilla/v2_4_1/__init__.py
similarity index 100%
rename from sahara/plugins/vanilla/v2_4_0/__init__.py
rename to sahara/plugins/vanilla/v2_4_1/__init__.py
diff --git a/sahara/plugins/vanilla/v2_4_0/config_helper.py b/sahara/plugins/vanilla/v2_4_1/config_helper.py
similarity index 88%
rename from sahara/plugins/vanilla/v2_4_0/config_helper.py
rename to sahara/plugins/vanilla/v2_4_1/config_helper.py
index eee1d383..d423a548 100644
--- a/sahara/plugins/vanilla/v2_4_0/config_helper.py
+++ b/sahara/plugins/vanilla/v2_4_1/config_helper.py
@@ -25,19 +25,19 @@ CONF.import_opt("enable_data_locality", "sahara.topology.topology_helper")
 LOG = logging.getLogger(__name__)
 
 CORE_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_0/resources/core-default.xml')
+    'plugins/vanilla/v2_4_1/resources/core-default.xml')
 
 HDFS_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_0/resources/hdfs-default.xml')
+    'plugins/vanilla/v2_4_1/resources/hdfs-default.xml')
 
 MAPRED_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_0/resources/mapred-default.xml')
+    'plugins/vanilla/v2_4_1/resources/mapred-default.xml')
 
 YARN_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_0/resources/yarn-default.xml')
+    'plugins/vanilla/v2_4_1/resources/yarn-default.xml')
 
 OOZIE_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_0/resources/oozie-default.xml')
+    'plugins/vanilla/v2_4_1/resources/oozie-default.xml')
 
 XML_CONFS = {
     "Hadoop": [CORE_DEFAULT],
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/README.rst b/sahara/plugins/vanilla/v2_4_1/resources/README.rst
similarity index 80%
rename from sahara/plugins/vanilla/v2_4_0/resources/README.rst
rename to sahara/plugins/vanilla/v2_4_1/resources/README.rst
index e6b80191..6f6dded1 100644
--- a/sahara/plugins/vanilla/v2_4_0/resources/README.rst
+++ b/sahara/plugins/vanilla/v2_4_1/resources/README.rst
@@ -9,15 +9,15 @@ This directory contains default XML configuration files:
 * yarn-default.xml
 * oozie-default.xml
 
-These files are applied for Sahara's plugin of Apache Hadoop version 2.4.0
+These files are applied for Sahara's plugin of Apache Hadoop version 2.4.1
 
 
 Files were taken from here:
 
-* `core-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.0/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml>`_
-* `hdfs-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.0/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml>`_
-* `yarn-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml>`_
-* `mapred-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml>`_
+* `core-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml>`_
+* `hdfs-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml>`_
+* `yarn-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml>`_
+* `mapred-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml>`_
 * `oozie-default.xml <https://github.com/apache/oozie/blob/release-4.0.1/core/src/main/resources/oozie-default.xml>`_
 
 XML configs are used to expose default Hadoop configurations to the users
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/core-default.xml b/sahara/plugins/vanilla/v2_4_1/resources/core-default.xml
similarity index 100%
rename from sahara/plugins/vanilla/v2_4_0/resources/core-default.xml
rename to sahara/plugins/vanilla/v2_4_1/resources/core-default.xml
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/hdfs-default.xml b/sahara/plugins/vanilla/v2_4_1/resources/hdfs-default.xml
similarity index 100%
rename from sahara/plugins/vanilla/v2_4_0/resources/hdfs-default.xml
rename to sahara/plugins/vanilla/v2_4_1/resources/hdfs-default.xml
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/mapred-default.xml b/sahara/plugins/vanilla/v2_4_1/resources/mapred-default.xml
similarity index 100%
rename from sahara/plugins/vanilla/v2_4_0/resources/mapred-default.xml
rename to sahara/plugins/vanilla/v2_4_1/resources/mapred-default.xml
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/oozie-default.xml b/sahara/plugins/vanilla/v2_4_1/resources/oozie-default.xml
similarity index 100%
rename from sahara/plugins/vanilla/v2_4_0/resources/oozie-default.xml
rename to sahara/plugins/vanilla/v2_4_1/resources/oozie-default.xml
diff --git a/sahara/plugins/vanilla/v2_4_0/resources/yarn-default.xml b/sahara/plugins/vanilla/v2_4_1/resources/yarn-default.xml
similarity index 99%
rename from sahara/plugins/vanilla/v2_4_0/resources/yarn-default.xml
rename to sahara/plugins/vanilla/v2_4_1/resources/yarn-default.xml
index 325c7a16..5066caab 100644
--- a/sahara/plugins/vanilla/v2_4_0/resources/yarn-default.xml
+++ b/sahara/plugins/vanilla/v2_4_1/resources/yarn-default.xml
@@ -1092,7 +1092,7 @@
     If enabled, clients will put entities and events to the timeline server.
     </description>
     <name>yarn.timeline-service.enabled</name>
-    <value>true</value>
+    <value>false</value>
   </property>
 
   <property>
@@ -1141,7 +1141,7 @@
   <property>
     <description>Store file name for leveldb timeline store.</description>
     <name>yarn.timeline-service.leveldb-timeline-store.path</name>
-    <value>${yarn.log.dir}/timeline</value>
+    <value>${hadoop.tmp.dir}/yarn/timeline</value>
   </property>
 
   <property>
@@ -1190,7 +1190,7 @@
     org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
     as the value for yarn.timeline-service.generic-application-history.store-class</description>
     <name>yarn.timeline-service.generic-application-history.fs-history-store.uri</name>
-    <value>${hadoop.log.dir}/yarn/system/history</value>
+    <value>${hadoop.tmp.dir}/yarn/timeline/generic-history</value>
   </property>
 
   <property>
diff --git a/sahara/plugins/vanilla/v2_4_0/versionhandler.py b/sahara/plugins/vanilla/v2_4_1/versionhandler.py
similarity index 98%
rename from sahara/plugins/vanilla/v2_4_0/versionhandler.py
rename to sahara/plugins/vanilla/v2_4_1/versionhandler.py
index 93fdb0ec..85524305 100644
--- a/sahara/plugins/vanilla/v2_4_0/versionhandler.py
+++ b/sahara/plugins/vanilla/v2_4_1/versionhandler.py
@@ -24,7 +24,7 @@ from sahara.plugins.vanilla.hadoop2 import run_scripts as run
 from sahara.plugins.vanilla.hadoop2 import scaling as sc
 from sahara.plugins.vanilla.hadoop2 import validation as vl
 from sahara.plugins.vanilla import utils as vu
-from sahara.plugins.vanilla.v2_4_0 import config_helper as c_helper
+from sahara.plugins.vanilla.v2_4_1 import config_helper as c_helper
 
 
 conductor = conductor.API