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 2016/03/21 17:14:50 UTC
[1/2] ambari git commit: AMBARI-15491. Non NameNode-HA properties
still in hdfs-site.xml after enabling HA (scripts refer to non-existent
property values) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 34a8b13aa -> d862f7aa8
AMBARI-15491. Non NameNode-HA properties still in hdfs-site.xml after enabling HA (scripts refer to non-existent property values) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0877a9c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0877a9c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0877a9c
Branch: refs/heads/trunk
Commit: a0877a9c7252de528502e35730860f50aa412559
Parents: 34a8b13
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Mar 21 18:10:12 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Mar 21 18:13:10 2016 +0200
----------------------------------------------------------------------
.../resources/custom_actions/scripts/check_host.py.rej | 10 ++++++++++
.../resources/stacks/HDP/2.2/upgrades/config-upgrade.xml | 4 ++++
.../resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 2 ++
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0877a9c/ambari-server/src/main/resources/custom_actions/scripts/check_host.py.rej
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py.rej b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py.rej
new file mode 100644
index 0000000..0b32a51
--- /dev/null
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py.rej
@@ -0,0 +1,10 @@
+--- ambari-server/src/main/resources/custom_actions/scripts/check_host.py
++++ ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+@@ -359,6 +359,7 @@
+ Execute(install_cmd, not_if = format("test -e {java_exec}"))
+ File(format("{java_home}/bin/java"), mode=0755, cd_access="a")
+ Directory(java_home, user=getpass.getuser(), recursive_ownership=True)
++ Execute(('chmod', '-R', '755', java_home), sudo = True)
+ except Exception, e:
+ message = "Error installing java.\n" + str(e)
+ print message
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0877a9c/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
index 440bd50..257893f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
@@ -34,6 +34,10 @@
<type>hdfs-site</type>
<transfer operation="delete" delete-key="dfs.namenode.rpc-address" if-type="hdfs-site"
if-key="dfs.nameservices" if-key-state="present"/>
+ <transfer operation="delete" delete-key="dfs.namenode.http-address" if-type="hdfs-site"
+ if-key="dfs.nameservices" if-key-state="present"/>
+ <transfer operation="delete" delete-key="dfs.namenode.https-address" if-type="hdfs-site"
+ if-key="dfs.nameservices" if-key-state="present"/>
</definition>
<definition xsi:type="configure" id="hdp_2_3_0_0_modify_hadoop_env" summary="Modify hadoop-env.sh">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0877a9c/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index d826446..45e2f94 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -181,6 +181,8 @@
<definition xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments">
<type>hdfs-site</type>
<transfer operation="delete" delete-key="dfs.namenode.rpc-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/>
+ <transfer operation="delete" delete-key="dfs.namenode.http-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/>
+ <transfer operation="delete" delete-key="dfs.namenode.https-address" if-type="hdfs-site" if-key="dfs.nameservices" if-key-state="present"/>
</definition>
</changes>
</component>
[2/2] ambari git commit: AMBARI-15490. DB connection check installs
JDK with incorrect permissions. umask 027, non root (aonishuk)
Posted by ao...@apache.org.
AMBARI-15490. DB connection check installs JDK with incorrect permissions. umask 027, non root (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d862f7aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d862f7aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d862f7aa
Branch: refs/heads/trunk
Commit: d862f7aa8d6570b7d1ce2a9e1ccaebc4db0377b5
Parents: a0877a9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Mar 21 18:13:11 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Mar 21 18:13:11 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/custom_actions/scripts/check_host.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d862f7aa/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 9b79290..85ccef1 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -359,6 +359,7 @@ class CheckHost(Script):
Execute(install_cmd, not_if = format("test -e {java_exec}"))
File(format("{java_home}/bin/java"), mode=0755, cd_access="a")
Directory(java_home, user=getpass.getuser(), recursive_ownership=True)
+ Execute(('chmod', '-R', '755', java_home), sudo = True)
except Exception, e:
message = "Error installing java.\n" + str(e)
print message