Repository: ambari Updated Branches: refs/heads/trunk 63186bf3e -> f22256e73
AMBARI-21234. Ambari rack awareness for Kafka. (Ambud Sharma via stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f22256e7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f22256e7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f22256e7 Branch: refs/heads/trunk Commit: f22256e73af4e4cb27d3aaf47ba58a8864e37873 Parents: 63186bf Author: Ambud Sharma <ambud.sha...@hortonworks.com> Authored: Fri Jul 14 16:04:17 2017 +0200 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Fri Jul 14 16:04:17 2017 +0200 ---------------------------------------------------------------------- .../common-services/KAFKA/0.10.0.3.0/metainfo.xml | 1 + .../KAFKA/0.10.0.3.0/package/scripts/kafka.py | 10 ++++++++++ .../KAFKA/0.10.0.3.0/package/scripts/params.py | 3 +++ .../resources/common-services/KAFKA/0.10.0/metainfo.xml | 1 + .../KAFKA/0.8.1/package/scripts/kafka.py | 12 ++++++++++++ .../KAFKA/0.8.1/package/scripts/params.py | 3 +++ 6 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml index a19850e..f408ba3 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/metainfo.xml @@ -104,6 +104,7 @@ </osSpecific> </osSpecifics> <restartRequiredAfterChange>true</restartRequiredAfterChange> + <restartRequiredAfterRackChange>true</restartRequiredAfterRackChange> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka.py index 680dd32..62a9003 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka.py @@ -103,6 +103,16 @@ def kafka(upgrade_type=None): kafka_data_dir = kafka_server_config['log.dirs'] kafka_data_dirs = filter(None, kafka_data_dir.split(",")) + + rack="/default-rack" + i=0 + if len(params.all_racks) > 0: + for host in params.all_hosts: + if host == params.hostname: + rack=params.all_racks[i] + break + i=i+1 + Directory(kafka_data_dirs, mode=0755, cd_access='a', http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py index 5b0be54..4d0448f 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py @@ -105,6 +105,9 @@ zookeeper_hosts.sort() secure_acls = default("/configurations/kafka-broker/zookeeper.set.acl", False) kafka_security_migrator = os.path.join(kafka_home, "bin", "zookeeper-security-migration.sh") +all_hosts = default("/clusterHostInfo/all_hosts", []) +all_racks = default("/clusterHostInfo/all_racks", []) + #Kafka log4j kafka_log_maxfilesize = default('/configurations/kafka-log4j/kafka_log_maxfilesize',256) kafka_log_maxbackupindex = default('/configurations/kafka-log4j/kafka_log_maxbackupindex',20) http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/metainfo.xml index 84b47d8..c1fcde8 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/metainfo.xml @@ -22,6 +22,7 @@ <name>KAFKA</name> <extends>common-services/KAFKA/0.9.0</extends> <version>0.10.0</version> + <restartRequiredAfterRackChange>true</restartRequiredAfterRackChange> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py index 680dd32..3fe1e2d 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py @@ -103,6 +103,18 @@ def kafka(upgrade_type=None): kafka_data_dir = kafka_server_config['log.dirs'] kafka_data_dirs = filter(None, kafka_data_dir.split(",")) + + rack="/default-rack" + i=0 + if len(params.all_racks) > 0: + for host in params.all_hosts: + if host == params.hostname: + rack=params.all_racks[i] + break + i=i+1 + + kafka_server_config['broker.rack']=rack + Directory(kafka_data_dirs, mode=0755, cd_access='a', http://git-wip-us.apache.org/repos/asf/ambari/blob/f22256e7/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py index 9acc1ef..c7e84fc 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py @@ -105,6 +105,9 @@ zookeeper_hosts.sort() secure_acls = default("/configurations/kafka-broker/zookeeper.set.acl", False) kafka_security_migrator = os.path.join(kafka_home, "bin", "zookeeper-security-migration.sh") +all_hosts = default("/clusterHostInfo/all_hosts", []) +all_racks = default("/clusterHostInfo/all_racks", []) + #Kafka log4j kafka_log_maxfilesize = default('/configurations/kafka-log4j/kafka_log_maxfilesize',256) kafka_log_maxbackupindex = default('/configurations/kafka-log4j/kafka_log_maxbackupindex',20)