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/09/08 22:17:55 UTC
[1/3] ambari git commit: AMBARI-18343. Ambari server start fails
after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 c9711d8cd -> 7f8fe8383
refs/heads/branch-2.5 df5fdb33e -> 339311034
refs/heads/trunk 7091fc2d1 -> 0090e3ac4
AMBARI-18343. Ambari server start fails after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0090e3ac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0090e3ac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0090e3ac
Branch: refs/heads/trunk
Commit: 0090e3ac41034fb1bbd90436c1a286e084c31469
Parents: 7091fc2
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Sep 9 01:17:01 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Sep 9 01:17:01 2016 +0300
----------------------------------------------------------------------
ambari-server/src/main/package/rpm/preinstall.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0090e3ac/ambari-server/src/main/package/rpm/preinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh b/ambari-server/src/main/package/rpm/preinstall.sh
index 09e66a5..524fea8 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -43,22 +43,19 @@ then
mv "$SERVER_CONF_SAVE" "$SERVER_CONF_SAVE_BACKUP"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_PROPERTIES" ]
then
- mv -f "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
+ cp -n "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_ENV" ]
then
- mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD"
+ cp -n "$AMBARI_ENV" "$AMBARI_ENV_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_KRB_JAAS_LOGIN_FILE" ]
then
- mv -f "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
+ cp -n "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
fi
if [ -d "$STACKS_FOLDER" ]
[3/3] ambari git commit: AMBARI-18343. Ambari server start fails
after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster
(aonishuk)
Posted by ao...@apache.org.
AMBARI-18343. Ambari server start fails after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33931103
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33931103
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33931103
Branch: refs/heads/branch-2.5
Commit: 33931103464b3564652f0a8497557769e41b9eeb
Parents: df5fdb3
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Sep 9 01:17:07 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Sep 9 01:17:07 2016 +0300
----------------------------------------------------------------------
ambari-server/src/main/package/rpm/preinstall.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/33931103/ambari-server/src/main/package/rpm/preinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh b/ambari-server/src/main/package/rpm/preinstall.sh
index 28878bb..b4c4da0 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -43,22 +43,19 @@ then
mv "$SERVER_CONF_SAVE" "$SERVER_CONF_SAVE_BACKUP"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_PROPERTIES" ]
then
- mv -f "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
+ cp -n "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_ENV" ]
then
- mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD"
+ cp -n "$AMBARI_ENV" "$AMBARI_ENV_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_KRB_JAAS_LOGIN_FILE" ]
then
- mv -f "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
+ cp -n "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
fi
if [ -d "$STACKS_FOLDER" ]
[2/3] ambari git commit: AMBARI-18343. Ambari server start fails
after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster
(aonishuk)
Posted by ao...@apache.org.
AMBARI-18343. Ambari server start fails after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f8fe838
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f8fe838
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f8fe838
Branch: refs/heads/branch-2.4
Commit: 7f8fe8383390af8addbf1bb58dbabc8c892bfedf
Parents: c9711d8
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Sep 9 01:17:04 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Sep 9 01:17:04 2016 +0300
----------------------------------------------------------------------
ambari-server/src/main/package/rpm/preinstall.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7f8fe838/ambari-server/src/main/package/rpm/preinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh b/ambari-server/src/main/package/rpm/preinstall.sh
index 28878bb..b4c4da0 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -43,22 +43,19 @@ then
mv "$SERVER_CONF_SAVE" "$SERVER_CONF_SAVE_BACKUP"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_PROPERTIES" ]
then
- mv -f "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
+ cp -n "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_ENV" ]
then
- mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD"
+ cp -n "$AMBARI_ENV" "$AMBARI_ENV_OLD"
fi
-# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually.
if [ -f "$AMBARI_KRB_JAAS_LOGIN_FILE" ]
then
- mv -f "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
+ cp -n "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
fi
if [ -d "$STACKS_FOLDER" ]