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 2015/12/15 15:28:43 UTC
ambari git commit: AMBARI-14373. If a bunch of RMF resources is
defined using list of names, list is modified in runtime (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 54d2326ca -> a9a20f6b9
AMBARI-14373. If a bunch of RMF resources is defined using list of names, list is modified in runtime (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9a20f6b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9a20f6b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9a20f6b
Branch: refs/heads/trunk
Commit: a9a20f6b94ab9e35574c46486944d1fbeedc261d
Parents: 54d2326
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 15 16:28:05 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 15 16:28:05 2015 +0200
----------------------------------------------------------------------
.../src/main/python/resource_management/core/base.py | 9 +++++----
.../KAFKA/0.8.1.2.2/package/scripts/kafka.py | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a20f6b/ambari-common/src/main/python/resource_management/core/base.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/base.py b/ambari-common/src/main/python/resource_management/core/base.py
index 1711c22..b8e07d3 100644
--- a/ambari-common/src/main/python/resource_management/core/base.py
+++ b/ambari-common/src/main/python/resource_management/core/base.py
@@ -109,10 +109,11 @@ class Resource(object):
def __new__(cls, name, env=None, provider=None, **kwargs):
if isinstance(name, list):
- while len(name) != 1:
- cls(name.pop(0), env, provider, **kwargs)
+ names_list = name[:]
+ while len(names_list) != 1:
+ cls(names_list.pop(0), env, provider, **kwargs)
- name = name[0]
+ name = names_list[0]
env = env or Environment.get_instance()
provider = provider or getattr(cls, 'provider', None)
@@ -128,7 +129,7 @@ class Resource(object):
def __init__(self, name, env=None, provider=None, **kwargs):
if isinstance(name, list):
- name = name.pop(0)
+ name = name[-1]
if hasattr(self, 'name'):
return
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a20f6b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index f02be4b..faabee0 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -77,7 +77,7 @@ def kafka(upgrade_type=None):
kafka_data_dir = kafka_server_config['log.dirs']
kafka_data_dirs = filter(None, kafka_data_dir.split(","))
- Directory(kafka_data_dirs[:], # Todo: remove list copy when AMBARI-14373 is fixed
+ Directory(kafka_data_dirs,
mode=0755,
cd_access='a',
owner=params.kafka_user,
@@ -212,7 +212,7 @@ def ensure_base_directories():
"""
import params
base_dirs = [params.kafka_log_dir, params.kafka_pid_dir, params.conf_dir]
- Directory(base_dirs[:], # Todo: remove list copy when AMBARI-14373 is fixed
+ Directory(base_dirs,
mode=0755,
cd_access='a',
owner=params.kafka_user,