AMBARI-11065. Make sure that KMS related configs are updated when a new KMS is added to the cluster (akovalenko)

ambari-web/app/controllers/main/host/details.js

@@ -239,6 +239,12 @@ App.MainHostDetailsController = Em.Controller.extend({
       deleteNimbusMsg: Em.View.extend({
         template: Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteNimbus'))
       }),
+      isRangerKMSServer: function () {
+        return componentName == 'RANGER_KMS_SERVER';
+      }.property(),
+      deleteRangerKMSServereMsg: Em.View.extend({
+        template: Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteRangerKMSServer'))
+      }),
       isChecked: false,
       disablePrimary: function () {
         return !this.get('isChecked');
@@ -338,6 +344,9 @@ App.MainHostDetailsController = Em.Controller.extend({
     } else if(data.componentName == 'NIMBUS') {
       this.set('deleteNimbusHost', true);
       this.loadConfigs('loadStormConfigs');
+    } else if(data.componentName == 'RANGER_KMS_SERVER') {
+      this.set('deleteRangerKMSServer', true);
+      this.loadConfigs('loadRangerConfigs');
     }
   },
 
@@ -456,11 +465,10 @@ App.MainHostDetailsController = Em.Controller.extend({
     var
       returnFunc,
       self = this,
-      hiveHost = event.hiveMetastoreHost ? event.hiveMetastoreHost : "";
       component = event.context,
-      hostName = this.get('content.hostName'),
+      hostName = event.selectedHost || this.get('content.hostName'),
       componentName = component.get('componentName'),
-      missedComponents = !!hiveHost ? [] : componentsUtils.checkComponentDependencies(componentName, {
+      missedComponents = event.selectedHost ? [] : componentsUtils.checkComponentDependencies(componentName, {
         scope: 'host',
         installedComponents: this.get('content.hostComponents').mapProperty('componentName')
       });
@@ -480,7 +488,7 @@ App.MainHostDetailsController = Em.Controller.extend({
         break;
       case 'HIVE_METASTORE':
         returnFunc = App.showConfirmationPopup(function () {
-          self.set('hiveMetastoreHost', hiveHost);
+          self.set('hiveMetastoreHost', hostName);
           self.loadConfigs("loadHiveConfigs");
         }, Em.I18n.t('hosts.host.addComponent.' + componentName ));
         break;
@@ -490,6 +498,12 @@ App.MainHostDetailsController = Em.Controller.extend({
             self.loadConfigs("loadStormConfigs");
         }, Em.I18n.t('hosts.host.addComponent.' + componentName));
         break;
+      case 'RANGER_KMS_SERVER':
+        returnFunc = App.showConfirmationPopup(function() {
+          self.set('rangerKMSServerHost', hostName);
+          self.loadConfigs("loadRangerConfigs");
+        }, Em.I18n.t('hosts.host.addComponent.' + componentName));
+        break;
       default:
         returnFunc = this.addClientComponent(component);
       }
@@ -698,59 +712,9 @@ App.MainHostDetailsController = Em.Controller.extend({
                }
            }
        ];
-    this.saveStormConfigsBatch(groups, nimbusHost);
+    this.saveConfigsBatch(groups, 'NIMBUS', nimbusHost);
    },
 
-     /**
-   * save configs' sites in batch
-   * @param nimbusHost
-   * @param groups
-   */
-  saveStormConfigsBatch: function (groups, nimbusHost) {
-    groups.forEach(function (group) {
-      var desiredConfigs = [],
-        tag = 'version' + (new Date).getTime(),
-        properties = group.properties;
-
-      for (var site in properties) {
-        if (!properties.hasOwnProperty(site) || Em.isNone(properties[site])) continue;
-        desiredConfigs.push({
-          "type": site,
-          "tag": tag,
-          "properties": properties[site],
-          "properties_attributes": group.properties_attributes[site],
-          "service_config_version_note": Em.I18n.t('hosts.host.storm.configs.save.note')
-        });
-      }
-      if (desiredConfigs.length > 0) {
-        App.ajax.send({
-          name: 'common.service.configurations',
-          sender: this,
-          data: {
-            desired_config: desiredConfigs,
-            stormNimbusHost: nimbusHost
-          },
-          success: 'installStormNimbus'
-        });
-      }
-      //clear nimbus host not to send second request to install component
-      nimbusHost = null;
-    }, this);
-  },
-
-  /**
-   * success callback for saveStormConfigsBatch method
-   * @param data
-   * @param opt
-   * @param params
-   */
-  installStormNimbus: function(data, opt, params) {
-    if (params.stormNimbusHost) {
-      componentsUtils.installHostComponent(params.stormNimbusHost, App.StackServiceComponent.find("NIMBUS"));
-    }
-  },
-  /**
-
   /**
    * Success callback for load configs request
    * @param {object} data
@@ -825,15 +789,15 @@ App.MainHostDetailsController = Em.Controller.extend({
         }
       }
     ];
-    this.saveConfigsBatch(groups, hiveMetastoreHost);
+    this.saveConfigsBatch(groups, 'HIVE_METASTORE', hiveMetastoreHost);
   },
 
   /**
    * save configs' sites in batch
-   * @param hiveMetastoreHost
+   * @param host
    * @param groups
    */
-  saveConfigsBatch: function (groups, hiveMetastoreHost) {
+  saveConfigsBatch: function (groups, componentName, host) {
     groups.forEach(function (group) {
       var desiredConfigs = [],
         tag = 'version' + (new Date).getTime(),
@@ -846,7 +810,7 @@ App.MainHostDetailsController = Em.Controller.extend({
           "tag": tag,
           "properties": properties[site],
           "properties_attributes": group.properties_attributes[site],
-          "service_config_version_note": Em.I18n.t('hosts.host.hive.configs.save.note')
+          "service_config_version_note": Em.I18n.t('hosts.host.configs.save.note').format(App.format.role(componentName))
         });
       }
       if (desiredConfigs.length > 0) {
@@ -855,13 +819,14 @@ App.MainHostDetailsController = Em.Controller.extend({
           sender: this,
           data: {
             desired_config: desiredConfigs,
-            hiveMetastoreHost: hiveMetastoreHost
+            componentName: componentName,
+            host: host
           },
-          success: 'installHiveMetastore'
+          success: 'installHostComponent'
         });
       }
       //clear hive metastore host not to send second request to install component
-      hiveMetastoreHost = null;
+      host = null;
     }, this);
   },
 
@@ -871,9 +836,9 @@ App.MainHostDetailsController = Em.Controller.extend({
    * @param opt
    * @param params
    */
-  installHiveMetastore: function(data, opt, params) {
-    if (params.hiveMetastoreHost) {
-      componentsUtils.installHostComponent(params.hiveMetastoreHost, App.StackServiceComponent.find("HIVE_METASTORE"));
+  installHostComponent: function(data, opt, params) {
+    if (params.host) {
+      componentsUtils.installHostComponent(params.host, App.StackServiceComponent.find(params.componentName));
     }
   },
   /**
@@ -900,6 +865,77 @@ App.MainHostDetailsController = Em.Controller.extend({
     return hiveHosts.sort();
   },
 
+  /**
+   * Success callback for load configs request
+   * @param {object} data
+   * @method loadHiveConfigs
+   */
+  loadRangerConfigs: function (data) {
+    App.ajax.send({
+      name: 'admin.get.all_configurations',
+      sender: this,
+      data: {
+        urlParams: '(type=core-site&tag=' + data.Clusters.desired_configs['core-site'].tag + ')|(type=hdfs-site&tag=' + data.Clusters.desired_configs['hdfs-site'].tag + ')|(type=kms-env&tag=' + data.Clusters.desired_configs['kms-env'].tag + ')'
+      },
+      success: 'onLoadRangerConfigs'
+    });
+  },
+
+  /**
+   * update and save Hive hive.metastore.uris config to server
+   * @param {object} data
+   * @method onLoadHiveConfigs
+   */
+  onLoadRangerConfigs: function (data) {
+    var hostToInstall = this.get('rangerKMSServerHost');
+    var rkmsHosts = this.getRangerKMSServerHosts();
+    var rkmsPort = data.items.findProperty('type', 'kms-env').properties['kms_port'];
+    var coreSiteConfigs = data.items.findProperty('type', 'core-site');
+    var hdfsSiteConfigs = data.items.findProperty('type', 'core-site');
+    var groups = [
+      {
+        properties: {
+          'core-site': coreSiteConfigs.properties,
+          'hdfs-site': hdfsSiteConfigs.properties
+        },
+        properties_attributes: {
+          'core-site': coreSiteConfigs.properties_attributes,
+          'hdfs-site': hdfsSiteConfigs.properties_attributes
+        }
+      }
+    ];
+
+    for (var i = 0; i < rkmsHosts.length; i++) {
+      rkmsHosts[i] = rkmsHosts[i] + ':' + rkmsPort;
+    }
+    coreSiteConfigs.properties['hadoop.security.key.provider.path'] = 'kms://http@' + rkmsHosts.join(',') + '/kms';
+    hdfsSiteConfigs.properties['dfs.encryption.key.provider.uri'] = 'kms://http@' + rkmsHosts.join(',') + '/kms';
+    this.saveConfigsBatch(groups, 'RANGER_KMS_SERVER', hostToInstall);
+  },
+
+  /**
+   * Delete Hive Metastore is performed
+   * @type {bool}
+   */
+  deleteRangerKMSServer: false,
+
+  getRangerKMSServerHosts: function () {
+    var rkmsHosts = App.HostComponent.find().filterProperty('componentName', 'RANGER_KMS_SERVER').mapProperty('hostName');
+    var rangerKMSServerHost = this.get('rangerKMSServerHost');
+
+    if(!!rangerKMSServerHost){
+      rkmsHosts.push(rangerKMSServerHost);
+      this.set('rangerKMSServerHost', '');
+    }
+
+    if (this.get('fromDeleteHost') || this.get('deleteRangerKMSServer')) {
+      this.set('deleteRangerKMSServer', false);
+      this.set('fromDeleteHost', false);
+      return rkmsHosts.without(this.get('content.hostName'));
+    }
+    return rkmsHosts.sort();
+  },
+
   /**
    * Delete Storm Nimbus is performed
    * @type {bool}
@@ -1099,7 +1135,7 @@ App.MainHostDetailsController = Em.Controller.extend({
         }
       );
     }
-    this.saveConfigsBatch(groups);
+    this.saveConfigsBatch(groups, 'ZOOKEEPER_SERVER');
   },
   /**
    *

ambari-web/app/controllers/main/service/item.js

@@ -683,11 +683,11 @@ App.MainServiceItemController = Em.Controller.extend({
         var selectedHost = this.get('selectedHost');
 
         // Install
-        if(component.get('componentName') == "HIVE_METASTORE" && !!selectedHost){
+        if(['HIVE_METASTORE', 'RANGER_KMS_SERVER'].contains(component.get('componentName')) && !!selectedHost){
           App.router.get('mainHostDetailsController').addComponent(
             {
               context: component,
-              hiveMetastoreHost: selectedHost
+              selectedHost: selectedHost
             }
           );
         } else {

ambari-web/app/messages.js

@@ -2156,12 +2156,15 @@ Em.I18n.translations = {
   'host.host.componentFilter.client':'Client Components',
   'hosts.host.deleteComponent.popup.msg1':'Are you sure you want to delete {0}?',
   'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
+  'hosts.host.deleteComponent.popup.deleteRangerKMSServer': 'Deleting <i>Ranger KMS Server</i> may reconfigure such properties:<ul><li>hadoop.security.key.provider.path</li><li>dfs.encryption.key.provider.uri</li>',
   'hosts.host.deleteComponent.popup.warning':'<b>WARNING!</b> Delete the last <i>{0}</i> component in the cluster?</br>Deleting the last component in the cluster could result in permanent loss of service data.',
   'hosts.host.deleteComponent.popup.confirm':'Confirm Delete',
   'hosts.host.installComponent.popup.confirm':'Confirm Install',
   'hosts.host.installComponent.msg':'Are you sure you want to install {0}?',
   'hosts.host.addComponent.msg':'Are you sure you want to add {0}?',
   'hosts.host.addComponent.ZOOKEEPER_SERVER':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
+  'hosts.host.addComponent.NIMBUS': 'Adding Nimbus will reconfigure the <b>nimbus.seeds</b> property if it is defined.',
+  'hosts.host.addComponent.RANGER_KMS_SERVER': 'Adding Ranger KMS Server may reconfigure such properties:<ul><li>hadoop.security.key.provider.path</li><li>dfs.encryption.key.provider.uri</li>',
   'hosts.host.addComponent.deleteHostWithZooKeeper':'Deleting host with ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
   'host.host.addComponent.popup.dependedComponents.body': '{0} requires {1} to be installed along with it on the same host. Please add them first and then try adding {0}',
   'host.host.addComponent.popup.dependedComponents.header': 'Component dependencies',
@@ -2188,7 +2191,7 @@ Em.I18n.translations = {
   'hosts.host.decommissioning':'Decommissioning',
   'hosts.host.addComponent.HIVE_METASTORE':'Adding <i>Hive Metastore</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>',
   'hosts.host.deleteComponent.popup.deleteHiveMetastore':'Deleting <i>Hive Metastore</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>',
-  'hosts.host.hive.configs.save.note': 'This configuration is created by ambari while installing/deleting hive component on a host',
+  'hosts.host.configs.save.note': 'This configuration is created by ambari while installing/deleting {0} component on a host',
 
   'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Maintenance Mode because Host is in Maintenance Mode',
   'hosts.component.passive.implied.service.mode.tooltip':'Cannot Turn Off Maintenance Mode because {0} is in Maintenance Mode',

ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs

@@ -16,18 +16,26 @@
 * limitations under the License.
 }}
 
-{{deleteComponentMsg}}<br /><br />
+{{deleteComponentMsg}}<br/><br/>
 {{#if lastComponent}}
-    <div class="alert-error row-fluid">
-        <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="isChecked"}}</div>
-        <div class='span10'>{{view lastComponentError}}</div>
-    </div>
+  <div class="alert-error row-fluid">
+    <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="isChecked"}}</div>
+    <div class='span10'>{{view lastComponentError}}</div>
+  </div>
 {{/if}}
 {{#if isZkServer}}
-  <br />
+  <br/>
   <div class='alert'>{{view deleteZkServerMsg}}</div>
 {{/if}}
 {{#if isHiveMetastore}}
-  <br />
+  <br/>
   <div class='alert'>{{view deleteHiveMetastoreMsg}}</div>
+{{/if}}
+{{#if isNimbus}}
+  <br/>
+  <div class='alert'>{{view deleteNimbusMsg}}</div>
+{{/if}}
+{{#if isRangerKMSServer}}
+  <br/>
+  <div class='alert'>{{view deleteRangerKMSServereMsg}}</div>
 {{/if}}