You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/11/11 14:59:09 UTC
ambari git commit: AMBARI-13813 After kerberization,
Kafka brokers fail to start (additional patch) (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 62b6547ee -> 1ca59255e
AMBARI-13813 After kerberization, Kafka brokers fail to start (additional patch) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1ca59255
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1ca59255
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1ca59255
Branch: refs/heads/trunk
Commit: 1ca59255ed13e615dfddeffa3b3660f5cb6dbb90
Parents: 62b6547
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Nov 11 15:58:59 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Nov 11 15:58:59 2015 +0200
----------------------------------------------------------------------
.../ambari/server/upgrade/UpgradeCatalog213.java | 18 +++++++-----------
.../server/upgrade/UpgradeCatalog213Test.java | 1 -
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ca59255/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index f78188c..f2b79a6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -946,17 +946,13 @@ public class UpgradeCatalog213 extends AbstractUpgradeCatalog {
}
}
- StackId stackId = cluster.getCurrentStackVersion();
- if (stackId != null && stackId.getStackName().equals("HDP") &&
- VersionUtils.compareVersions(stackId.getStackVersion(), "2.3") >= 0) {
- Config kafkaEnv = cluster.getDesiredConfigByType(KAFKA_ENV_CONFIG);
- if (kafkaEnv != null) {
- String kafkaEnvContent = kafkaEnv.getProperties().get(CONTENT_PROPERTY);
- if (kafkaEnvContent != null && !kafkaEnvContent.contains(KAFKA_ENV_CONTENT_KERBEROS_PARAMS)) {
- kafkaEnvContent += "\n\nexport KAFKA_KERBEROS_PARAMS=\"$KAFKA_KERBEROS_PARAMS {{kafka_kerberos_params}}\"";
- Map<String, String> updates = Collections.singletonMap(CONTENT_PROPERTY, kafkaEnvContent);
- updateConfigurationPropertiesForCluster(cluster, KAFKA_ENV_CONFIG, updates, true, false);
- }
+ Config kafkaEnv = cluster.getDesiredConfigByType(KAFKA_ENV_CONFIG);
+ if (kafkaEnv != null) {
+ String kafkaEnvContent = kafkaEnv.getProperties().get(CONTENT_PROPERTY);
+ if (kafkaEnvContent != null && !kafkaEnvContent.contains(KAFKA_ENV_CONTENT_KERBEROS_PARAMS)) {
+ kafkaEnvContent += "\n\nexport KAFKA_KERBEROS_PARAMS=\"$KAFKA_KERBEROS_PARAMS {{kafka_kerberos_params}}\"";
+ Map<String, String> updates = Collections.singletonMap(CONTENT_PROPERTY, kafkaEnvContent);
+ updateConfigurationPropertiesForCluster(cluster, KAFKA_ENV_CONFIG, updates, true, false);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ca59255/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
index 61cc5ce..b0a6c3a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
@@ -811,7 +811,6 @@ public class UpgradeCatalog213Test {
expect(mockClusterExpected.getDesiredConfigByType("kafka-broker")).andReturn(mockAmsEnv).atLeastOnce();
expect(mockAmsEnv.getProperties()).andReturn(propertiesAmsEnv).atLeastOnce();
- expect(mockClusterExpected.getCurrentStackVersion()).andReturn(new StackId("HDP", "2.3"));
expect(mockClusterExpected.getDesiredConfigByType("kafka-env")).andReturn(mockKafkaEnv).atLeastOnce();
expect(mockKafkaEnv.getProperties()).andReturn(propertiesKafkaEnv).atLeastOnce();