You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/04/19 00:03:20 UTC
ambari git commit: AMBARI-15814: Enable debugging of ambari-server
upgrade command
Repository: ambari
Updated Branches:
refs/heads/trunk c623e4270 -> acf45f862
AMBARI-15814: Enable debugging of ambari-server upgrade command
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acf45f86
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acf45f86
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acf45f86
Branch: refs/heads/trunk
Commit: acf45f862f111a5c7b6fa17efd87fcfb0933dbd2
Parents: c623e42
Author: Nahappan Somasundaram <ns...@hortonworks.com>
Authored: Mon Apr 18 11:30:16 2016 -0700
Committer: Nahappan Somasundaram <ns...@hortonworks.com>
Committed: Mon Apr 18 14:45:36 2016 -0700
----------------------------------------------------------------------
.../main/python/ambari_server/serverUpgrade.py | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/acf45f86/ambari-server/src/main/python/ambari_server/serverUpgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverUpgrade.py b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
index 72c4185..cdcce1c 100644
--- a/ambari-server/src/main/python/ambari_server/serverUpgrade.py
+++ b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
@@ -48,6 +48,7 @@ from ambari_server.serverUtils import is_server_runing, get_ambari_server_api_ba
from ambari_server.userInput import get_validated_string_input, get_prompt_default, read_password, get_YN_input
from ambari_server.serverClassPath import ServerClassPath
from ambari_server.setupMpacks import replay_mpack_logs
+from ambari_commons.logging_utils import get_debug_mode, set_debug_mode_from_options
# constants
STACK_NAME_VER_SEP = "-"
@@ -60,6 +61,18 @@ STACK_UPGRADE_HELPER_CMD = "{0} -cp {1} " + \
"org.apache.ambari.server.upgrade.StackUpgradeHelper" + \
" {2} {3} > " + configDefaults.SERVER_OUT_FILE + " 2>&1"
+SCHEMA_UPGRADE_HELPER_CMD_DEBUG = "{0} " \
+ "-server -XX:NewRatio=2 " \
+ "-XX:+UseConcMarkSweepGC " + \
+ " -Xdebug -Xrunjdwp:transport=dt_socket,address=5005," \
+ "server=y,suspend={2} " \
+ "-cp {1} " + \
+ "org.apache.ambari.server.upgrade.SchemaUpgradeHelper" + \
+ " > " + configDefaults.SERVER_OUT_FILE + " 2>&1"
+
+SCHEMA_UPGRADE_DEBUG = False
+
+SUSPEND_START_MODE = False
#
# Stack upgrade
@@ -255,7 +268,12 @@ def run_schema_upgrade(args):
serverClassPath = ServerClassPath(get_ambari_properties(), args)
class_path = serverClassPath.get_full_ambari_classpath_escaped_for_shell(validate_classpath=True)
- command = SCHEMA_UPGRADE_HELPER_CMD.format(jdk_path, class_path)
+ set_debug_mode_from_options(args)
+ debug_mode = get_debug_mode()
+ debug_start = (debug_mode & 1) or SCHEMA_UPGRADE_DEBUG
+ suspend_start = (debug_mode & 2) or SUSPEND_START_MODE
+ suspend_mode = 'y' if suspend_start else 'n'
+ command = SCHEMA_UPGRADE_HELPER_CMD_DEBUG.format(jdk_path, class_path, suspend_mode) if debug_start else SCHEMA_UPGRADE_HELPER_CMD.format(jdk_path, class_path)
ambari_user = read_ambari_user()
current_user = ensure_can_start_under_current_user(ambari_user)