Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8790176D7 for ; Tue, 15 Sep 2015 09:21:16 +0000 (UTC) Received: (qmail 70097 invoked by uid 500); 15 Sep 2015 09:21:16 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 70004 invoked by uid 500); 15 Sep 2015 09:21:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 69988 invoked by uid 99); 15 Sep 2015 09:21:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 09:21:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FDCADFE14; Tue, 15 Sep 2015 09:21:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Tue, 15 Sep 2015 09:21:17 -0000 Message-Id: In-Reply-To: <56d366f583604efe97280e3d3ffcde51@git.apache.org> References: <56d366f583604efe97280e3d3ffcde51@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-13097. On non-hdfs clusters namenode fails to start (aonishuk) AMBARI-13097. On non-hdfs clusters namenode fails to start (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/115e0546 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/115e0546 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/115e0546 Branch: refs/heads/branch-2.1 Commit: 115e0546edd5c9a2a24bf806b255336e5078e6e5 Parents: 4af321f Author: Andrew Onishuk Authored: Tue Sep 15 12:21:08 2015 +0300 Committer: Andrew Onishuk Committed: Tue Sep 15 12:21:08 2015 +0300 ---------------------------------------------------------------------- .../resource_management/libraries/providers/hdfs_resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/115e0546/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py index 1d1aeba..b12e4a1 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py @@ -37,7 +37,7 @@ from resource_management.libraries.functions import namenode_ha_utils import ambari_simplejson as json # simplejson is much faster comparing to Python 2.6 json module and has the same functions set. import subprocess -JSON_PATH = '/var/lib/ambari-agent/data/hdfs_resources.json' +JSON_PATH = '/var/lib/ambari-agent/tmp/hdfs_resources.json' JAR_PATH = '/var/lib/ambari-agent/lib/fast-hdfs-resource.jar' RESOURCE_TO_JSON_FIELDS = {