You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/09/25 17:24:17 UTC
git commit: AMBARI-7489. Fix upgrade when Ooozie is not
installed.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 0833a91d0 -> c9a7a3c4a
AMBARI-7489. Fix upgrade when Ooozie is not installed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9a7a3c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9a7a3c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9a7a3c4
Branch: refs/heads/trunk
Commit: c9a7a3c4aa0f1414af611c59b583aafe219fdc33
Parents: 0833a91
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Sep 25 18:14:58 2014 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Sep 25 18:14:58 2014 +0300
----------------------------------------------------------------------
.../apache/ambari/server/upgrade/UpgradeCatalog170.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9a7a3c4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 35e80ff..6693e20 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -988,10 +988,10 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog {
protected void addMissingConfigs() throws AmbariException {
addNewConfigurationsFromXml();
- addOozieConfig();
+ updateOozieConfigLog4j();
}
- protected void addOozieConfig() throws AmbariException {
+ protected void updateOozieConfigLog4j() throws AmbariException {
final String PROPERTY_NAME = "log4j.appender.oozie.layout.ConversionPattern=";
final String PROPERTY_VALUE_OLD = "%d{ISO8601} %5p %c{1}:%L - %m%n";
final String PROPERTY_VALUE_NEW = "%d{ISO8601} %5p %c{1}:%L - SERVER[${oozie.instance.id}] %m%n";
@@ -1007,8 +1007,11 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog {
if (clusterMap != null && !clusterMap.isEmpty()) {
for (final Cluster cluster : clusterMap.values()) {
- content = cluster.getDesiredConfigByType(
- "oozie-log4j").getProperties().get("content");
+ content = null;
+ if (cluster.getDesiredConfigByType("oozie-log4j") != null) {
+ content = cluster.getDesiredConfigByType(
+ "oozie-log4j").getProperties().get("content");
+ }
if (content != null) {
content = content.replace(PROPERTY_NAME + PROPERTY_VALUE_OLD,