Updated Branches: refs/heads/trunk aa8de8964 -> 72438ae29
AMBARI-3180. Helper script for HDP upgrade (improve error message). Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/72438ae2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/72438ae2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/72438ae2 Branch: refs/heads/trunk Commit: 72438ae293b0b77672029200230e088645d9352f Parents: aa8de89 Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 16 16:46:18 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 16 16:46:18 2013 -0700 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 +++ ambari-server/src/main/python/UpgradeHelper_HDP2.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/72438ae2/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 732c03c..00550c3 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -348,6 +348,9 @@ <source> <location>src/main/resources/scripts/distribute_keytabs.py</location> </source> + <source> + <location>src/main/python/UpgradeHelper_HDP2.py</location> + </source> </sources> </mapping> <mapping> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/72438ae2/ambari-server/src/main/python/UpgradeHelper_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/UpgradeHelper_HDP2.py b/ambari-server/src/main/python/UpgradeHelper_HDP2.py index 20db21f..6157b43 100644 --- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py +++ b/ambari-server/src/main/python/UpgradeHelper_HDP2.py @@ -338,8 +338,9 @@ def read_mapping(): if os.path.isfile(MR_MAPPING_FILE): return json.load(open(MR_MAPPING_FILE)) else: - raise FatalException(-1, "MAPREDUCE host mapping file is not available or badly formatted. Execute action " - "save-mr-mapping or manually create the file.") + raise FatalException(-1, "MAPREDUCE host mapping file, mr_mapping, is not available or badly formatted. Execute " + "action save-mr-mapping. Ensure the file is present in the directory where you are " + "executing this command.") pass
