Bump Hadoop to 2.4.1 version
Change-Id: I8f742c472a20650f8c7f2a01bcaefb6eff232123
This commit is contained in:
Sergey Reshetnyak
parent
159aea00c7
commit
79c0961fe7
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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],
|
||||
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
|
@ -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
|
||||
Loading…
Reference in New Issue