AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart before finalizing. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4c7b61f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4c7b61f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4c7b61f Branch: refs/heads/branch-2.6 Commit: f4c7b61f34ea4b7994396b00fdd2556b261bfb86 Parents: 8ba409b Author: Siddharth Wagle <[email protected]> Authored: Fri Oct 13 20:52:22 2017 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Fri Oct 13 20:52:22 2017 -0700 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py | 4 ++-- .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py | 4 ++-- .../AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py index 2158e72..8bfd116 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py @@ -44,13 +44,13 @@ class AmsCollector(Script): hbase('regionserver', action) ams(name='collector') - def start(self, env): + def start(self, env, upgrade_type=None): self.configure(env, action = 'start') # for security # stop hanging components before start ams_service('collector', action = 'stop') ams_service('collector', action = 'start') - def stop(self, env): + def stop(self, env, upgrade_type=None): import params env.set_params(params) # Sometimes, stop() may be called before start(), in case restart() is initiated right after installation http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py index b048cd7..7fe168b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py @@ -38,7 +38,7 @@ class AmsGrafana(Script): env.set_params(params) ams(name='grafana', action=action) - def start(self, env): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env, action = 'start') @@ -61,7 +61,7 @@ class AmsGrafana(Script): # Create pre-built dashboards create_ams_dashboards() - def stop(self, env): + def stop(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env, action = 'stop') http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py index b344464..df94836 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py @@ -35,14 +35,14 @@ class AmsMonitor(Script): env.set_params(params) ams(name='monitor') - def start(self, env): + def start(self, env, upgrade_type=None): self.configure(env) # for security ams_service( 'monitor', action = 'start' ) - def stop(self, env): + def stop(self, env, upgrade_type=None): import params env.set_params(params)
