Updated Branches: refs/heads/trunk c35d8ae4f -> 188b7dbd8
AMBARI-3151. ambari-server command output should point to Apache Ambari documentation. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/188b7dbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/188b7dbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/188b7dbd Branch: refs/heads/trunk Commit: 188b7dbd8a570a24595d4d690c28fe7b53d16cc6 Parents: c35d8ae Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 9 18:28:32 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 9 18:28:32 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 22 +++++++++++--------- .../stacks/HDP/2.0.5/services/PIG/metainfo.xml | 2 +- .../HDPLocal/2.0.5/services/PIG/metainfo.xml | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/188b7dbd/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 8986f84..6bd4d36 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -123,6 +123,12 @@ BOLD_OFF='\033[0m' #Common messages PRESS_ENTER_MSG="Press <enter> to continue." +#Common setup or upgrade message +SETUP_OR_UPGRADE_MSG = " If it is a new setup then only run \"ambari-server setup\" command to create user\n" \ +" If it is an upgrade then run \"ambari-server upgrade\" command.\n" \ +" For more information, see documentation at http://incubator.apache"; \ +".org/ambari/current/installing-hadoop-using-ambari/content/" + #SSL certificate metainfo COMMON_NAME_ATTR='CN' NOT_BEFORE_ATTR='notBefore' @@ -1325,9 +1331,8 @@ def check_database_name_property(): dbname = properties[JDBC_DATABASE_PROPERTY] if dbname is None or dbname == "": - raise FatalException(-1, 'DB Name property not set in config file. '\ - 'If you recently upgraded, ensure that you ran "ambari-server upgrade". '\ - 'Otherwise, if it is a new installation, please run "ambari-server setup" first.') + err = "DB Name property not set in config file.\n" + SETUP_OR_UPGRADE_MSG + raise FatalException(-1, err) def configure_database_username_password(args): properties = get_ambari_properties() @@ -2131,10 +2136,7 @@ def start(args): current_user = getpass.getuser() ambari_user = read_ambari_user() if ambari_user is None: - err = "Unable to detect a system user for Ambari Server.\n" \ - "If it is a new setup then only run \"ambari-server setup\" command to create user\n" \ - "If it is an upgrade then run \"ambari-server upgrade\" command.\n" \ - "See documentation at http://docs.hortonworks.com/HDPDocuments/HDP1/HDP-1.3.2/bk_using_Ambari_book/content/ambari-chap9-3.html"; + err = "Unable to detect a system user for Ambari Server.\n" + SETUP_OR_UPGRADE_MSG raise FatalException(1, err) if current_user != ambari_user and not is_root(): err = "Unable to start Ambari Server as user {0}. Please either run \"ambari-server start\" " \ @@ -2358,8 +2360,7 @@ def upgrade(args): user = read_ambari_user() if user is None: - warn = 'Can not determine custom ambari user. Please run ' \ - '"ambari-server setup" before starting server' + warn = "Can not determine custom ambari user.\n" + SETUP_OR_UPGRADE_MSG print_warning_msg(warn) else: adjust_directory_permissions(user) @@ -3673,7 +3674,8 @@ def main(): parser.error("Invalid action") if action in ACTION_REQUIRE_RESTART and need_restart: - if is_server_runing(): + status, pid = is_server_runing() + if status: print 'NOTE: Restart Ambari Server to apply changes'+ \ ' ("ambari-server restart|stop|start")' http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/188b7dbd/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml index 84cf04e..7333eed 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml @@ -18,7 +18,7 @@ <metainfo> <user>root</user> <comment>Scripting platform for analyzing large datasets</comment> - <version>0.11.1.2.0.5.0</version> + <version>0.11.2.2.0.5.0</version> <components> <component> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/188b7dbd/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml index 84cf04e..7333eed 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml @@ -18,7 +18,7 @@ <metainfo> <user>root</user> <comment>Scripting platform for analyzing large datasets</comment> - <version>0.11.1.2.0.5.0</version> + <version>0.11.2.2.0.5.0</version> <components> <component>
