You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/07/25 10:22:23 UTC
ambari git commit: AMBARI-17876 Delete Ranger KMS service does not
give recommendations on dependent service config updates (FE). (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4c1dfce22 -> 61c73dc0f
AMBARI-17876 Delete Ranger KMS service does not give recommendations on dependent service config updates (FE). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61c73dc0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61c73dc0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61c73dc0
Branch: refs/heads/trunk
Commit: 61c73dc0f9118f601ce0a2a2ff77f3ac240a0fd0
Parents: 4c1dfce
Author: ababiichuk <ab...@hortonworks.com>
Authored: Mon Jul 25 11:01:15 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Mon Jul 25 13:19:02 2016 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/item.js | 37 +++++++++++++++-----
ambari-web/app/messages.js | 1 +
2 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/61c73dc0/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 64a0d3c..ce0b240 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1271,15 +1271,18 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
} else if (dependentServices.length > 0) {
this.dependentServicesWarning(serviceName, dependentServices);
} else if (this.allowUninstallServices(serviceNamesToDelete)) {
- App.showConfirmationPopup(
- function() {self.confirmDeleteService(serviceName, interDependentServices, dependentServicesToDeleteFmt)},
- Em.I18n.t('services.service.delete.popup.warning').format(displayName) +
- (interDependentServices.length ? Em.I18n.t('services.service.delete.popup.warning.dependent').format(dependentServicesToDeleteFmt) : ''),
- null,
- popupHeader,
- Em.I18n.t('common.delete'),
- true
- );
+ if (serviceName === 'RANGER_KMS') {
+ App.showConfirmationPopup(
+ function() {self.showLastWarning(serviceName, interDependentServices, dependentServicesToDeleteFmt)},
+ Em.I18n.t('services.service.delete.popup.warning.ranger_kms'),
+ null,
+ popupHeader,
+ Em.I18n.t('common.delete'),
+ true
+ );
+ } else {
+ this.showLastWarning(serviceName, interDependentServices, dependentServicesToDeleteFmt);
+ }
} else {
var body = Em.I18n.t('services.service.delete.popup.mustBeStopped').format(displayName);
if (interDependentServices.length) {
@@ -1339,6 +1342,22 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
});
},
+ showLastWarning: function (serviceName, interDependentServices, dependentServicesToDeleteFmt) {
+ var self = this,
+ displayName = App.format.role(serviceName, true),
+ popupHeader = Em.I18n.t('services.service.delete.popup.header');
+
+ return App.showConfirmationPopup(
+ function() {self.confirmDeleteService(serviceName, interDependentServices, dependentServicesToDeleteFmt)},
+ Em.I18n.t('services.service.delete.popup.warning').format(displayName) +
+ (interDependentServices.length ? Em.I18n.t('services.service.delete.popup.warning.dependent').format(dependentServicesToDeleteFmt) : ''),
+ null,
+ popupHeader,
+ Em.I18n.t('common.delete'),
+ true
+ );
+ },
+
/**
* Confirmation popup of service deletion
* @param {string} serviceName
http://git-wip-us.apache.org/repos/asf/ambari/blob/61c73dc0/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6d1e23a..c768749 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1882,6 +1882,7 @@ Em.I18n.translations = {
'services.service.delete.progressPopup.message': 'Deleting {0}...',
'services.service.delete.service.success.confirmation': 'Service {0} was successfully deleted',
'services.service.delete.service.success.confirmation.plural': 'Services {0} were successfully deleted',
+ 'services.service.delete.popup.warning.ranger_kms': '<b>Ranger KMS should not be deleted if encryption zones (EZ) and keys are being managed by the service. Otherwise data in the EZ will not be accessible.</b>',
'services.service.summary.unknown':'unknown',
'services.service.summary.notRunning':'Not Running',