You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/05/16 15:36:54 UTC
[1/2] ambari git commit: AMBARI-11150 - [WinTP2] Ambari Windows
services description should not include version
Repository: ambari
Updated Branches:
refs/heads/trunk 8cd295c10 -> 9a4b24cb2
AMBARI-11150 - [WinTP2] Ambari Windows services description should not include version
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/45822d24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/45822d24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/45822d24
Branch: refs/heads/trunk
Commit: 45822d24765b913f07f28828956508ed09f37258
Parents: 8cd295c
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Fri May 15 02:41:56 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Sat May 16 16:29:22 2015 +0300
----------------------------------------------------------------------
ambari-agent/conf/windows/service_wrapper.py | 2 --
.../src/main/python/ambari_commons/ambari_service.py | 10 ----------
.../src/main/python/amhm_service.py | 2 --
.../src/main/python/amc_service.py | 2 --
ambari-server/src/main/python/ambari_windows_service.py | 2 --
5 files changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/45822d24/ambari-agent/conf/windows/service_wrapper.py
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/windows/service_wrapper.py b/ambari-agent/conf/windows/service_wrapper.py
index 5831e11..0851745 100644
--- a/ambari-agent/conf/windows/service_wrapper.py
+++ b/ambari-agent/conf/windows/service_wrapper.py
@@ -66,8 +66,6 @@ class AmbariAgentService(AmbariService):
AmbariService._svc_display_name_ = "Ambari Agent"
AmbariService._svc_description_ = "Ambari Agent"
- AmbariService._AdjustServiceVersion()
-
heartbeat_stop_handler = None
# Adds the necessary script dir to the Python's modules path
http://git-wip-us.apache.org/repos/asf/ambari/blob/45822d24/ambari-common/src/main/python/ambari_commons/ambari_service.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/ambari_commons/ambari_service.py b/ambari-common/src/main/python/ambari_commons/ambari_service.py
index 391ddc3..8e7e7aa 100644
--- a/ambari-common/src/main/python/ambari_commons/ambari_service.py
+++ b/ambari-common/src/main/python/ambari_commons/ambari_service.py
@@ -64,16 +64,6 @@ class AmbariService(WinService):
self.SvcDoRun()
pass
- # Call during initialization to implement standard service versioning
- @classmethod
- def _AdjustServiceVersion(cls):
- if os.environ.has_key(AMBARI_VERSION_VAR):
- ambariVer = os.environ[AMBARI_VERSION_VAR]
- else:
- ambariVer = "1.3.0-SNAPSHOT"
- AmbariService._svc_display_name_ += "-" + ambariVer
- AmbariService._svc_description_ += " v" + ambariVer
-
# Override to customize the command-line arguments
def _InitOptionsParser(self):
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/45822d24/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
index 9d74f27..a23226f 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
+++ b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
@@ -40,8 +40,6 @@ class AMHostMonitoringService(AmbariService):
AmbariService._svc_display_name_ = "Ambari Metrics Host Monitoring"
AmbariService._svc_description_ = "Ambari Metrics Host Monitoring Service"
- AmbariService._AdjustServiceVersion()
-
# Adds the necessary script dir to the Python's modules path.
# Modify this as the deployed product's dir structure changes.
def _adjustPythonPath(self, current_dir):
http://git-wip-us.apache.org/repos/asf/ambari/blob/45822d24/ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py b/ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py
index b901e5c..d69c148 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py
@@ -38,8 +38,6 @@ class AMCollectorService(AmbariService):
AmbariService._svc_display_name_ = "Ambari Metrics Collector"
AmbariService._svc_description_ = "Ambari Metrics Collector Service"
- AmbariService._AdjustServiceVersion()
-
# Adds the necessary script dir(s) to the Python's modules path.
# Modify this as the deployed product's dir structure changes.
def _adjustPythonPath(self, current_dir):
http://git-wip-us.apache.org/repos/asf/ambari/blob/45822d24/ambari-server/src/main/python/ambari_windows_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_windows_service.py b/ambari-server/src/main/python/ambari_windows_service.py
index 502aeb9..d171204 100644
--- a/ambari-server/src/main/python/ambari_windows_service.py
+++ b/ambari-server/src/main/python/ambari_windows_service.py
@@ -35,8 +35,6 @@ class AmbariServerService(AmbariService):
AmbariService._svc_display_name_ = "Ambari Server"
AmbariService._svc_description_ = "Ambari Server"
- AmbariService._AdjustServiceVersion()
-
# Adds the necessary script dir to the Python's modules path
def _adjustPythonPath(self, current_dir):
python_path = os.path.join(current_dir, "sbin")
[2/2] ambari git commit: AMBARI-11171 - Ambari should add the
configurations to enable timeline service state preserving restart
Posted by ab...@apache.org.
AMBARI-11171 - Ambari should add the configurations to enable timeline service state preserving restart
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a4b24cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a4b24cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a4b24cb
Branch: refs/heads/trunk
Commit: 9a4b24cb2f6973fed229365253afc4dda8994c45
Parents: 45822d2
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Fri May 15 18:12:46 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Sat May 16 16:29:23 2015 +0300
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 19 +++++++++++++++++++
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 12 +-----------
.../services/YARN/configuration/yarn-site.xml | 5 +++++
3 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index 8898d20..049eeb2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 43db5b0..8905561 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 852c192..58c817f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++ b/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>
\ No newline at end of file