You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2016/02/11 01:43:41 UTC
ambari git commit: AMBARI-14820: Implement Activate HAWQ Standby
wizard to allow doing failover in HA mode (missing part) (bhuvnesh2703 via
jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 c98abf3a6 -> 44373cbcd
AMBARI-14820: Implement Activate HAWQ Standby wizard to allow doing failover in HA mode (missing part) (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44373cbc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44373cbc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44373cbc
Branch: refs/heads/branch-2.2
Commit: 44373cbcd7eed9447a25c686cdebe994d370cb5f
Parents: c98abf3
Author: Jun Aoki <ja...@apache.org>
Authored: Wed Feb 10 16:43:34 2016 -0800
Committer: Jun Aoki <ja...@apache.org>
Committed: Wed Feb 10 16:43:34 2016 -0800
----------------------------------------------------------------------
.../HAWQ/2.0.0/package/scripts/hawqstandby.py | 2 +-
ambari-web/app/messages.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/44373cbc/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
index 3395810..67152c1 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
@@ -51,7 +51,7 @@ class HawqStandby(Script):
from hawqstatus import get_pid_file
check_process_status(get_pid_file())
- def activatestandby(self, env):
+ def activate_standby(self, env):
import utils
utils.exec_hawq_operation(hawq_constants.ACTIVATE, "{0} -a -M {1} -v".format(hawq_constants.STANDBY, hawq_constants.FAST))
http://git-wip-us.apache.org/repos/asf/ambari/blob/44373cbc/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4bea211..6b1802a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2861,11 +2861,11 @@ Em.I18n.translations = {
'admin.addHawqStandby.wizard.step4.task3.title': 'Start HAWQ Service',
'admin.addHawqStandby.wizard.step4.notice.inProgress':'Please wait while HAWQ Standby Master is being deployed.',
'admin.addHawqStandby.wizard.step4.notice.completed':'HAWQ Standby Master has been enabled successfully.',
- 'admin.activateHawqStandby.button.enable': 'Activate HAWQ Standby',
+ 'admin.activateHawqStandby.button.enable': 'Activate HAWQ Standby',
'admin.activateHawqStandby.wizard.header': 'Activate HAWQ Standby Wizard',
'admin.activateHawqStandby.wizard.step1.header': 'Get Started',
'admin.activateHawqStandby.wizard.step1.body':'This wizard will walk you through activating HAWQ Standby.' +
- '<br/>Once activated, the HAWQ Standby will become the HAWQ Master and the old HAWQ master will be removed. ' +
+ '<br/>Once activated, HAWQ Standby will become HAWQ Master, and the previous HAWQ master will be removed. ' +
'Users will be able to connect to HAWQ database using the new HAWQ Master.' +
'<br/><br/><b>You should plan a cluster maintenance window and prepare for cluster downtime when ' +
'activating HAWQ Standby. During this operation, HAWQ service will be stopped and started.</b>' +
@@ -2882,7 +2882,7 @@ Em.I18n.translations = {
'HAWQ Standby will be activated to HAWQ Master.</div>',
'admin.activateHawqStandby.wizard.step2.confirm.host.body':'<b>Review HAWQ Master & Standby role changes.</b>',
'admin.activateHawqStandby.wizard.step2.confirmPopup.body': 'Do you wish to continue with activating HAWQ Standy? Please confirm, before proceeding as you will not be able to rollback from Ambari.',
- 'admin.activateHawqStandby.wizard.step3.header': 'Configure Components',
+ 'admin.activateHawqStandby.wizard.step3.header': 'Finalize Setup',
'admin.activateHawqStandby.wizard.step3.task0.title': 'Activate HAWQ Standby',
'admin.activateHawqStandby.wizard.step3.task1.title': 'Stop HAWQ Service',
'admin.activateHawqStandby.wizard.step3.task2.title': 'Reconfigure HAWQ',
@@ -2895,5 +2895,5 @@ Em.I18n.translations = {
' get back to a stable state. Are you sure you want to exit the wizard?',
'admin.activateHawqStandby.wizard.step3.notice.inProgress':'Please wait while HAWQ Standby is being activated',
'admin.activateHawqStandby.wizard.step3.notice.completed':'HAWQ Standby has been activated successfully.',
- 'admin.activateHawqStandby.wizard.step3.activateHawqStandbyCommand.context': "Execute HAWQ standby activate command"
+ 'admin.activateHawqStandby.wizard.step3.activateHawqStandbyCommand.context': "Execute HAWQ Standby activate command"
};