You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by di...@apache.org on 2017/07/21 20:09:36 UTC
ambari git commit: AMBARI-21553 Oozie server failed to restart post
IOP 4.2 migration (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 0ad9d587d -> 2441f68ab
AMBARI-21553 Oozie server failed to restart post IOP 4.2 migration (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2441f68a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2441f68a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2441f68a
Branch: refs/heads/branch-2.5
Commit: 2441f68ab6ea54c7ea30e0ae1a01ff9866d04106
Parents: 0ad9d58
Author: Di Li <di...@apache.org>
Authored: Fri Jul 21 16:08:31 2017 -0400
Committer: Di Li <di...@apache.org>
Committed: Fri Jul 21 16:08:31 2017 -0400
----------------------------------------------------------------------
.../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 2 +-
.../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2441f68a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
index c8549b3..13c0518 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
@@ -215,7 +215,7 @@
<type>oozie-env</type>
<replace key="content" find="export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}" replace-with="export CATALINA_BASE={{oozie_server_dir}}" />
</definition>
- <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Updating oozie env">
+ <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Update oozie env">
<type>oozie-env</type>
<replace key="content" find="/usr/lib/bigtop-tomcat7-7.0.75" replace-with="/usr/lib/bigtop-tomcat" />
</definition>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2441f68a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index bf6dd6b..297aebb 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -238,8 +238,9 @@
<definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_configurations" summary="Update oozie env">
<type>oozie-env</type>
<replace key="content" find="export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}" replace-with="export CATALINA_BASE={{oozie_server_dir}}" />
+ <replace key="content" find="export CATALINA_OPTS="$CATALINA_OPTS -Xms{{oozie_initial_heapsize}}" replace-with="export CATALINA_OPTS="$CATALINA_OPTS"/>
</definition>
- <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Updating oozie env">
+ <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Update oozie env">
<type>oozie-env</type>
<replace key="content" find="/usr/lib/bigtop-tomcat7-7.0.75" replace-with="/usr/lib/bigtop-tomcat" />
</definition>