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/09/15 11:21:16 UTC

[1/2] ambari git commit: AMBARI-13097. On non-hdfs clusters namenode fails to start (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 4af321fcf -> 115e0546e
  refs/heads/trunk 53878959a -> 950f732bc


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/950f732b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/950f732b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/950f732b

Branch: refs/heads/trunk
Commit: 950f732bc5c84e9d65f6d4f1214a7239dd903d97
Parents: 5387895
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Sep 15 12:21:02 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Sep 15 12:21:02 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/950f732b/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 ea3acdf..3436b97 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 = {


[2/2] ambari git commit: AMBARI-13097. On non-hdfs clusters namenode fails to start (aonishuk)

Posted by ao...@apache.org.
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 <ao...@hortonworks.com>
Authored: Tue Sep 15 12:21:08 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
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 = {