ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mug...@apache.org
Subject ambari git commit: AMBARI-21925 : Facilitate a parameter to provide HBase conf directory for atlas-env configurations. (Vishal Suvagia via mugdha)
Date Tue, 19 Sep 2017 06:47:14 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 26965b3eb -> 1f321e356


AMBARI-21925 : Facilitate a parameter to provide HBase conf directory for atlas-env configurations.
(Vishal Suvagia via mugdha)


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

Branch: refs/heads/trunk
Commit: 1f321e35693a1c8fe2c6c5a4ac3e1f454bf847e1
Parents: 26965b3
Author: Vishal Suvagia <vishalsuvagia@yahoo.com>
Authored: Tue Sep 19 12:06:03 2017 +0530
Committer: Mugdha Varadkar <mugdha@apache.org>
Committed: Tue Sep 19 12:16:16 2017 +0530

----------------------------------------------------------------------
 .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py  | 2 +-
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml                | 6 ++++++
 .../common-services/ATLAS/0.7.0.3.0/package/scripts/params.py  | 2 +-
 .../stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml  | 6 ++++++
 .../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  | 4 ++++
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml         | 4 ++++
 .../src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
 7 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 96041e6..968ceed 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -205,7 +205,7 @@ smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
 security_check_status_file = format('{log_dir}/security_check.status')
 
 # hbase
-hbase_conf_dir = "/etc/hbase/conf"
+hbase_conf_dir = default('configurations/atlas-env/atlas.hbase.conf.dir','/etc/hbase/conf')
 
 atlas_search_backend = default("/configurations/application-properties/atlas.graph.index.search.backend",
"")
 search_backend_solr = atlas_search_backend.startswith('solr')

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
index f97ca98..ee8aedd 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
@@ -185,4 +185,10 @@
     <description>Replication factor for the atlas solr collections.</description>
     <on-ambari-upgrade add="false" />
   </property>
+  <property>
+    <name>atlas.hbase.conf.dir</name>
+    <value>/etc/hbase/conf</value>
+    <description>Configurable HBase conf directory.</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
index 61b41d6..b01884c 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
@@ -202,7 +202,7 @@ smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
 security_check_status_file = format('{log_dir}/security_check.status')
 
 # hbase
-hbase_conf_dir = "/etc/hbase/conf"
+hbase_conf_dir = default('configurations/atlas-env/atlas.hbase.conf.dir','/etc/hbase/conf')
 
 atlas_search_backend = default("/configurations/application-properties/atlas.graph.index.search.backend",
"")
 search_backend_solr = atlas_search_backend.startswith('solr')

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml
index 821fafa..b69bccd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml
@@ -44,4 +44,10 @@
     <description>Replication factor for the atlas solr collections.</description>
     <on-ambari-upgrade add="false" />
   </property>
+  <property>
+    <name>atlas.hbase.conf.dir</name>
+    <value>/etc/hbase/conf</value>
+    <description>Configurable HBase conf directory.</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 83fde06..2b4c656 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -202,6 +202,10 @@
             <replace key="content" find="&lt;appender name=&quot;FILE&quot;
class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" replace-with="&lt;appender
name=&quot;FILE&quot; class=&quot;org.apache.log4j.RollingFileAppender&quot;&gt;"/>
             <replace key="content" find="&lt;logger name=&quot;com.thinkaurelius.titan&quot;
additivity=&quot;false&quot;&gt;&#x20;&#x20;&#x20;&#x20;&lt;level
value=&quot;info&quot;/&gt;" replace-with="&lt;logger name=&quot;com.thinkaurelius.titan&quot;
additivity=&quot;false&quot;&gt;&#xA;&#x20;&#x20;&#x20;&#x20;&lt;level
value=&quot;warn&quot;/&gt;"/>
           </definition>
+          <definition xsi:type="configure" id="atlas_hbase_conf_dir" summary="Adding configuration
for hbase conf directory">
+            <type>atlas-env</type>
+            <set key="atlas.hbase.conf.dir" value="/etc/hbase/conf"/>
+          </definition>
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index bee7b98..bce1e86 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -372,6 +372,10 @@
         <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
       </execute-stage>
 
+      <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Adding configuration
for hbase conf directory">
+        <task xsi:type="configure" id="atlas_hbase_conf_dir"/>
+      </execute-stage>
+
       <!-- KMS -->
       <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Apply config
changes for Ranger Kms plugin">
         <task xsi:type="configure" id="hdp_2_6_maint_ranger_kms_plugin_cluster_name"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index f7baf81..d5f2324 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -1041,6 +1041,7 @@
           <task xsi:type="configure" id="atlas_env_gc_worker"/>
           <task xsi:type="configure" id="hdp_2_6_atlas_kafka_auto_commit_enable_property_delete"/>
           <task xsi:type="configure" id="atlas_log4j_update_logger_settings"/>
+          <task xsi:type="configure" id="atlas_hbase_conf_dir"/>
         </pre-upgrade>
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
         <upgrade>


Mime
View raw message