You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/11/11 14:36:34 UTC

[1/2] ambari git commit: AMBARI-13834. Enabling Ranger plugin for Hbase in kerberos cluster shows jinja template (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b83506ed3 -> abc31d539
  refs/heads/trunk 9c5e8844a -> 62b6547ee


AMBARI-13834. Enabling Ranger plugin for Hbase in kerberos cluster shows jinja template (aonishuk)


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

Branch: refs/heads/trunk
Commit: 62b6547eec314fa6e81af765d3326e8bfb982e74
Parents: 9c5e884
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Nov 11 15:36:09 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Nov 11 15:36:09 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py  | 4 +++-
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/62b6547e/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 4779543..5ea3115 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -682,7 +682,9 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
     #Remove duplicates
     uniqueCoprocessorRegionClassList = []
-    [uniqueCoprocessorRegionClassList.append(i) for i in coprocessorRegionClassList if not uniqueCoprocessorRegionClassList.count(i)]
+    [uniqueCoprocessorRegionClassList.append(i)
+     for i in coprocessorRegionClassList if
+     not i in uniqueCoprocessorRegionClassList and i != '{{hbase_coprocessor_region_classes}}']
     putHbaseSiteProperty('hbase.coprocessor.region.classes', ','.join(set(uniqueCoprocessorRegionClassList)))
     servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
     rangerServiceVersion=''

http://git-wip-us.apache.org/repos/asf/ambari/blob/62b6547e/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 291a4ea..6b9dcd5 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2311,7 +2311,7 @@ class TestHDP22StackAdvisor(TestCase):
             "hbase.bucketcache.size": "",
             "hbase.bucketcache.percentage.in.combinedcache": "",
             "hbase.coprocessor.regionserver.classes": "",
-            "hbase.coprocessor.region.classes": ""
+            "hbase.coprocessor.region.classes": "{{hbase_coprocessor_region_classes}}"
           }
         },
         "ranger-hbase-plugin-properties": {


[2/2] ambari git commit: AMBARI-13834. Enabling Ranger plugin for Hbase in kerberos cluster shows jinja template (aonishuk)

Posted by ao...@apache.org.
AMBARI-13834. Enabling Ranger plugin for Hbase in kerberos cluster shows jinja template (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: abc31d539d7a4d4c182a7a424524dc0118245138
Parents: b83506e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Nov 11 15:36:11 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Nov 11 15:36:11 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py  | 4 +++-
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/abc31d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 4779543..5ea3115 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -682,7 +682,9 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
     #Remove duplicates
     uniqueCoprocessorRegionClassList = []
-    [uniqueCoprocessorRegionClassList.append(i) for i in coprocessorRegionClassList if not uniqueCoprocessorRegionClassList.count(i)]
+    [uniqueCoprocessorRegionClassList.append(i)
+     for i in coprocessorRegionClassList if
+     not i in uniqueCoprocessorRegionClassList and i != '{{hbase_coprocessor_region_classes}}']
     putHbaseSiteProperty('hbase.coprocessor.region.classes', ','.join(set(uniqueCoprocessorRegionClassList)))
     servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
     rangerServiceVersion=''

http://git-wip-us.apache.org/repos/asf/ambari/blob/abc31d53/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 291a4ea..6b9dcd5 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2311,7 +2311,7 @@ class TestHDP22StackAdvisor(TestCase):
             "hbase.bucketcache.size": "",
             "hbase.bucketcache.percentage.in.combinedcache": "",
             "hbase.coprocessor.regionserver.classes": "",
-            "hbase.coprocessor.region.classes": ""
+            "hbase.coprocessor.region.classes": "{{hbase_coprocessor_region_classes}}"
           }
         },
         "ranger-hbase-plugin-properties": {