ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-18017. Falcon Service check failed after deleting and adding back falcon after ambari only upgrade 2.2.1.1 -> 2.4.0.0 (aonishuk)
Date Thu, 04 Aug 2016 10:15:42 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 e673a6ff7 -> 959cde698
  refs/heads/trunk 771d99e63 -> f8c77b06e


AMBARI-18017. Falcon Service check failed after deleting and adding back falcon after ambari
only upgrade 2.2.1.1 -> 2.4.0.0 (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8c77b06
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8c77b06
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8c77b06

Branch: refs/heads/trunk
Commit: f8c77b06e758145331cb91d2e440419de36c5062
Parents: 771d99e
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Aug 4 13:15:33 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Aug 4 13:15:33 2016 +0300

----------------------------------------------------------------------
 .../FALCON/0.5.0.2.1/package/scripts/params_linux.py           | 2 +-
 .../main/resources/stacks/HDP/2.3/services/stack_advisor.py    | 4 ++--
 .../main/resources/stacks/HDP/2.5/services/stack_advisor.py    | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f8c77b06/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
index 349ebf1..c302eeb 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
@@ -163,7 +163,7 @@ if has_atlas_in_cluster():
       atlas_home_dir = os.environ['METADATA_HOME_DIR'] if 'METADATA_HOME_DIR' in os.environ
else format('{stack_root}/current/atlas-server')
       atlas_hook_cp = atlas_conf_dir + os.pathsep + os.path.join(atlas_home_dir, "hook",
"falcon", "*") + os.pathsep
     elif check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, stack_version_formatted):
-      atlas_hook_cp = format('{stack_root}/current/atlas-client/falcon/hook/*')
+      atlas_hook_cp = format('{stack_root}/current/atlas-client/hook/falcon/*')
 #endregion
 
 hdfs_site = config['configurations']['hdfs-site']

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8c77b06/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 94c3117..eb691eb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -744,8 +744,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
   def recommendFalconConfigurations(self, configurations, clusterData, services, hosts):
     #  In 2.5, the classname changed.  The 2.5 stack advisor method will
     #  call this with attribute set.  2.3 will use the old method name
-    if hasattr(self, "__atlasFalconHookClassName"):
-      atlas_application_class = self.__atlasFalconHookClassName
+    if hasattr(self, "atlasFalconHookClassName"):
+      atlas_application_class = self.atlasFalconHookClassName
     else:
       atlas_application_class = "org.apache.falcon.atlas.service.AtlasService"
     putFalconStartupProperty = self.putProperty(configurations, "falcon-startup.properties",
services)

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8c77b06/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 2670502..5797d91 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -82,12 +82,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   def recommendFalconConfigurations(self, configurations, clusterData, services, hosts):
     # Set the classname for the Falcon hook to 2.5 classname = all other 2.3
     # stack advisor changes are needed.
-    self.__atlasFalconHookClassName = "org.apache.atlas.falcon.service.AtlasService"
-    super(HDP25StackAdvisor,self).recommendFalconConfigurations(configurations, clusterData,
services, hosts)
-
-  def recommendFalconConfigurations(self, configurations, clusterData, services, hosts):
-    # Set the classname for the Falcon hook to 2.5 classname = all other 2.3
-    # stack advisor changes are needed.
     self.atlasFalconHookClassName = "org.apache.atlas.falcon.service.AtlasService"
     super(HDP25StackAdvisor,self).recommendFalconConfigurations(configurations, clusterData,
services, hosts)
 


Mime
View raw message