date:20170405

ambari git commit: AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics (vivekratnavel)

2017-04-05 Thread vivekratnavel

Repository: ambari
Updated Branches:
  refs/heads/trunk 7d0baec7d -> e61d11124


AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics 
(vivekratnavel)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e61d1112
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e61d1112
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e61d1112

Branch: refs/heads/trunk
Commit: e61d111245fd7631a4fd0a2d572d88b3f86a4b5f
Parents: 7d0baec
Author: Vivek Ratnavel Subramanian 
Authored: Wed Apr 5 15:43:26 2017 -0700
Committer: Vivek Ratnavel Subramanian 
Committed: Wed Apr 5 15:43:26 2017 -0700

--
 .../HDP/grafana-llapdaemon-daemons.json | 313 ++-
 1 file changed, 231 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e61d1112/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
index 2f69868..849f296 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
@@ -1189,7 +1189,7 @@
 "threshold2": null,
 "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": 29,
+  "id": 14,
   "isNew": true,
   "legend": {
 "avg": false,
@@ -1214,21 +1214,21 @@
   "steppedLine": false,
   "targets": [
 {
-  "aggregator": "max",
-  "alias": "95th Percentile",
+  "aggregator": "sum",
+  "alias": "MemHeapUsed",
   "app": "llapdaemon",
   "downsampleAggregator": "avg",
   "errors": {},
-  "metric": 
"io.IOMetrics.PercentileDecodingTime_30s95thPercentileLatency",
+  "metric": "jvm.JvmMetrics.MemHeapUsedM",
   "precision": "default",
-  "refId": "B",
+  "refId": "C",
   "templatedHost": "",
   "transform": "none"
 }
   ],
   "timeFrom": null,
   "timeShift": null,
-  "title": "95th Percentile Column Decoding Time (30s interval)",
+  "title": "Total JVM Heap Used",
   "tooltip": {
 "shared": false,
 "value_type": "cumulative"
@@ -1238,7 +1238,7 @@
   "x-axis": true,
   "y-axis": true,
   "y_formats": [
-"ms",
+"mbytes",
 "short"
   ]
 },
@@ -1261,7 +1261,7 @@
 "threshold2": null,
 "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": 30,
+  "id": 15,
   "isNew": true,
   "legend": {
 "avg": false,
@@ -1286,21 +1286,21 @@
   "steppedLine": false,
   "targets": [
 {
-  "aggregator": "max",
-  "alias": "Max",
+  "aggregator": "sum",
+  "alias": "MemNonHeapUsed",
   "app": "llapdaemon",
   "downsampleAggregator": "avg",
   "errors": {},
-  "metric": "io.IOMetrics.MaxDecodingTime",
+  "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
   "precision": "default",
-  "refId": "A",
+  "refId": "C",
   "templatedHost": "",
   "transform": "none"
 }
   ],
   "timeFrom": null,
   "timeShift": null,
-  "title": "Max Column Decoding Time",
+  "title": "Total JVM Non-Heap Used",
   "tooltip": {
 "shared": false,
 "value_type": "cumulative"
@@ -1310,19 +1310,10 @@
   "x-axis": true,
   "y-axis": true,
   "y_formats": [
-"ms",
+"mbytes",
 "short"
   ]
-}
-  ],
-  "showTitle": true,
-  "title": "IO Elevator Metrics"
-},
-{
-  "collapse": true,
-  "editable": true,
-  "height": "250px",
-  "panels": [
+},
 {
   "aliasColors": {},
   "bars": false,
@@ -1342,7 +1333,7 @@
 "threshold2": null,

ambari git commit: AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics (vivekratnavel)

2017-04-05 Thread vivekratnavel

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 09105035a -> 5d9d73248


AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics 
(vivekratnavel)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d9d7324
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d9d7324
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d9d7324

Branch: refs/heads/branch-2.5
Commit: 5d9d73248fb6cf1906372fa0a2c74530c29b67d9
Parents: 0910503
Author: Vivek Ratnavel Subramanian 
Authored: Wed Apr 5 15:40:14 2017 -0700
Committer: Vivek Ratnavel Subramanian 
Committed: Wed Apr 5 15:40:14 2017 -0700

--
 .../HDP/grafana-llapdaemon-daemons.json | 313 ++-
 1 file changed, 231 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d9d7324/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
index 2f69868..849f296 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-llapdaemon-daemons.json
@@ -1189,7 +1189,7 @@
 "threshold2": null,
 "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": 29,
+  "id": 14,
   "isNew": true,
   "legend": {
 "avg": false,
@@ -1214,21 +1214,21 @@
   "steppedLine": false,
   "targets": [
 {
-  "aggregator": "max",
-  "alias": "95th Percentile",
+  "aggregator": "sum",
+  "alias": "MemHeapUsed",
   "app": "llapdaemon",
   "downsampleAggregator": "avg",
   "errors": {},
-  "metric": 
"io.IOMetrics.PercentileDecodingTime_30s95thPercentileLatency",
+  "metric": "jvm.JvmMetrics.MemHeapUsedM",
   "precision": "default",
-  "refId": "B",
+  "refId": "C",
   "templatedHost": "",
   "transform": "none"
 }
   ],
   "timeFrom": null,
   "timeShift": null,
-  "title": "95th Percentile Column Decoding Time (30s interval)",
+  "title": "Total JVM Heap Used",
   "tooltip": {
 "shared": false,
 "value_type": "cumulative"
@@ -1238,7 +1238,7 @@
   "x-axis": true,
   "y-axis": true,
   "y_formats": [
-"ms",
+"mbytes",
 "short"
   ]
 },
@@ -1261,7 +1261,7 @@
 "threshold2": null,
 "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": 30,
+  "id": 15,
   "isNew": true,
   "legend": {
 "avg": false,
@@ -1286,21 +1286,21 @@
   "steppedLine": false,
   "targets": [
 {
-  "aggregator": "max",
-  "alias": "Max",
+  "aggregator": "sum",
+  "alias": "MemNonHeapUsed",
   "app": "llapdaemon",
   "downsampleAggregator": "avg",
   "errors": {},
-  "metric": "io.IOMetrics.MaxDecodingTime",
+  "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
   "precision": "default",
-  "refId": "A",
+  "refId": "C",
   "templatedHost": "",
   "transform": "none"
 }
   ],
   "timeFrom": null,
   "timeShift": null,
-  "title": "Max Column Decoding Time",
+  "title": "Total JVM Non-Heap Used",
   "tooltip": {
 "shared": false,
 "value_type": "cumulative"
@@ -1310,19 +1310,10 @@
   "x-axis": true,
   "y-axis": true,
   "y_formats": [
-"ms",
+"mbytes",
 "short"
   ]
-}
-  ],
-  "showTitle": true,
-  "title": "IO Elevator Metrics"
-},
-{
-  "collapse": true,
-  "editable": true,
-  "height": "250px",
-  "panels": [
+},
 {
   "aliasColors": {},
   "bars": false,
@@ -1342,7 +1333,7 @@
 "threshold2": null,

ambari git commit: AMBARI-20429. Warn users about pending requests while trying to enable Interactive Query immediately after disabling it (vivekratnavel)

2017-04-05 Thread vivekratnavel

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 413db00ff -> 09105035a


AMBARI-20429. Warn users about pending requests while trying to enable 
Interactive Query immediately after disabling it (vivekratnavel)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09105035
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09105035
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09105035

Branch: refs/heads/branch-2.5
Commit: 09105035abd51ef0d820bcafa7ec38cebb079e2f
Parents: 413db00
Author: Vivek Ratnavel Subramanian 
Authored: Wed Apr 5 14:59:47 2017 -0700
Committer: Vivek Ratnavel Subramanian 
Committed: Wed Apr 5 14:59:47 2017 -0700

--
 .../wizard/step7/assign_master_controller.js| 75 ++--
 ambari-web/app/messages.js  |  2 +
 ambari-web/app/utils/ajax/ajax.js   |  4 ++
 .../configs/widgets/config_widget_view.js   |  3 +
 4 files changed, 78 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09105035/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
--
diff --git 
a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js 
b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index e2c5fa6..b1e3397 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -62,15 +62,13 @@ App.AssignMasterOnStep7Controller = 
Em.Controller.extend(App.BlueprintMixin, App
 this.set('configWidgetContext', context);
 this.set('content', context.get('controller.content'));
 this.set('configActionComponent', hostComponent);
-var missingDependentServices = this.getAllMissingDependentServices();
-var isNonWizardPage = !this.get('content.controllerName');
+
 switch (action) {
   case 'ADD':
-if (missingDependentServices.length && isNonWizardPage) {
-  this.showInstallServicesPopup(missingDependentServices);
+if (hostComponent.componentName == "HIVE_SERVER_INTERACTIVE") {
+  this.getPendingBatchRequests(hostComponent);  
 } else {
-  this.set('mastersToCreate', [hostComponent.componentName]);
-  this.showAssignComponentPopup();
+  this.showPopup(hostComponent);
 }
 break;
   case 'DELETE':
@@ -80,6 +78,71 @@ App.AssignMasterOnStep7Controller = 
Em.Controller.extend(App.BlueprintMixin, App
 }
   },
 
+  getPendingBatchRequests: function(hostComponent) {
+var self = this;
+// Send Ajax request to get status of pending batch requests
+App.ajax.send({
+  name : 'request_schedule.get.pending',
+  sender: self,
+  error : 'pendingBatchRequestsAjaxError',
+  success: 'pendingBatchRequestsAjaxSuccess',
+  data: {
+hostComponent: hostComponent
+  }
+});
+  },
+
+  pendingBatchRequestsAjaxError: function(data) {
+var error = 
Em.I18n.t('services.service.actions.run.yarnRefreshQueues.error');
+if(data && data.responseText){
+  try {
+var json = $.parseJSON(data.responseText);
+error += json.message;
+  } catch (err) {}
+}
+
App.showAlertPopup(Em.I18n.t('services.service.actions.run.yarnRefreshQueues.error'),
 error, null);
+  },
+
+  pendingBatchRequestsAjaxSuccess : function(data, opt, params) {
+var self = this;
+var showAlert = false;
+if (data.hasOwnProperty('items') && data.items.length > 0) {
+  data.items.forEach( function(_item) {
+_item.RequestSchedule.batch.batch_requests.forEach( 
function(batchRequest) {
+  // Check if a DELETE request on HIVE_SERVER_INTERACTIVE is in 
progress
+  if (batchRequest.request_type == "DELETE" && 
batchRequest.request_uri.indexOf("HIVE_SERVER_INTERACTIVE") > -1) {
+showAlert = true;
+  }
+});
+  });
+}
+if (showAlert) {
+  
App.showAlertPopup(Em.I18n.t('services.service.actions.hsi.alertPopup.header'), 
Em.I18n.t('services.service.actions.hsi.alertPopup.body'), function() {
+var configWidgetContext = self.get('configWidgetContext');
+var config = self.get('configWidgetContext.config');
+configWidgetContext.toggleProperty('controller.forceUpdateBoundaries');
+var value = config.get('initialValue');
+config.set('value', value);
+configWidgetContext.setValue(value);
+configWidgetContext.sendRequestRorDependentConfigs(config);
+this.hide();
+  });
+} else {
+  this.showPopup(params.hostComponent);
+}
+  },
+  
+  showPopup: function(hostComponent) {
+var

ambari git commit: AMBARI-20612. Fetching running application logs results in java.io.IOException (Madhuvanthi Radhakrishnan via smohanty)

2017-04-05 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6e256d9f0 -> 413db00ff


AMBARI-20612. Fetching running application logs results in java.io.IOException 
(Madhuvanthi Radhakrishnan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/413db00f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/413db00f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/413db00f

Branch: refs/heads/branch-2.5
Commit: 413db00ffe8592baef121c132189ff054fa6c630
Parents: 6e256d9
Author: Sumit Mohanty 
Authored: Tue Mar 28 21:40:37 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 13:04:41 2017 -0700

--
 .../upgrades/FixYarnWebServiceUrl.java  | 103 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   7 +
 .../upgrades/FixYarnWebServiceUrlTest.java  | 305 +++
 8 files changed, 446 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/413db00f/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
new file mode 100644
index 000..ae2631a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import com.google.inject.Inject;
+
+/**
+ * yarn.log.server.web-service.url is added in HDP 2.6
+ * It takes value from yarn.timeline-service.webapp.address if the 
yarn.http.policy is HTTP_ONLY
+ * and takes value from yarn.timeline-service.webapp.https.address if the 
yarn.http.policy is HTTPS_ONLY.
+ * This class is used when moving from HDP-2.3/HDP-2.4/HDP-2.5 to HDP2.6
+ */
+public class FixYarnWebServiceUrl extends AbstractServerAction {
+private static final String SOURCE_CONFIG_TYPE = "yarn-site";
+private static final String YARN_TIMELINE_WEBAPP_HTTPADDRESS = 
"yarn.timeline-service.webapp.address";
+private static final String YARN_TIMELINE_WEBAPP_HTTPSADDRESS = 
"yarn.timeline-service.webapp.https.address";
+private static final String YARN_LOGSERVER_WEBSERVICE_URL = 
"yarn.log.server.web-service.url";
+private static final String YARN_HTTP_POLICY = "yarn.http.policy";
+private static final String HTTP = "HTTP_ONLY";
+private static final String HTTPS = "HTTPS_ONLY";
+
+@Inject
+private Clusters clusters;
+
+@Override
+public CommandReport execute(ConcurrentMap 
requestSharedDataContext)
+throws AmbariException, InterruptedException{
+
+String clusterName = getExecutionCommand().getClusterName();
+Cluster cluster = clusters.getCluster(clusterName);
+Config config = cluster.getDesiredConfigByType(SOURCE_CONFIG_TYPE);
+
+if (config == null) {
+return  createCommandReport(0, HostRoleStatus.FAILED,"{}",
+String.format("Source type %s not found",

ambari git commit: AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth Seth via smohanty)

2017-04-05 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a9a23e22a -> 6e256d9f0


AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth 
Seth via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e256d9f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e256d9f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e256d9f

Branch: refs/heads/branch-2.5
Commit: 6e256d9f09c16f79f912889f50dfb3bcf19aa232
Parents: a9a23e2
Author: Sumit Mohanty 
Authored: Fri Mar 24 16:05:04 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 13:01:16 2017 -0700

--
 .../HIVE/configuration/hive-interactive-site.xml | 19 +++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml   |  6 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml  |  7 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml  |  1 +
 4 files changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index e11bb18..52d5db4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -703,4 +703,23 @@ limitations under the License.
 
 
   
+  
+hive.map.aggr.hash.min.reduction
+0.99
+
+  Hash aggregation will be turned off if the ratio between hash  table 
size and input rows is bigger than this number.
+  Set to 1 to make sure hash aggregation is never turned off.
+
+
+  
+  
+hive.vectorized.groupby.maxentries
+100
+
+  Max number of entries in the vector group by aggregation hashtables.
+  Exceeding this will trigger a flush irrelevant of memory pressure 
condition.
+
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 95040aa..9e4abb3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -458,6 +458,12 @@
 
   
 
+  
+hive-interactive-site
+
+
+  
+
   
 hive-interactive-site
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 4c7faf1..ba78742 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -685,6 +685,13 @@
   Updating the Hive Log4J2 properties to include 
parameterizations
 
   
+
+  
+
+  Updating Hash Aggregation settings for LLAP
+
+  
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 11d24c9..a0b438e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -834,6 +834,7 @@
   
   
   
+

[3/3] ambari git commit: AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh deployments (smohanty)

2017-04-05 Thread smohanty

AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh 
deployments (smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9a23e22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9a23e22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9a23e22

Branch: refs/heads/branch-2.5
Commit: a9a23e22afd4b92226baed28af43aa33aeb7ba59
Parents: 7fbec01
Author: Sumit Mohanty 
Authored: Fri Mar 24 20:31:18 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:57:29 2017 -0700

--
 .../stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a23e22/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
index cd19519..f0b945a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
@@ -24,4 +24,9 @@ limitations under the License.
 true
 
   
+  
+atlas.cluster.name
+
+true
+

[1/3] ambari git commit: AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated atlas tags (Vishal Suvagia via smohanty)

2017-04-05 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 44b5155fc -> a9a23e22a


AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated 
atlas tags (Vishal Suvagia via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1730747c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1730747c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1730747c

Branch: refs/heads/branch-2.5
Commit: 1730747cf0da3a35dd85f4864e04d389d25cad30
Parents: 44b5155
Author: Sumit Mohanty 
Authored: Fri Mar 24 06:53:22 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:56:18 2017 -0700

--
 .../common-services/RANGER/0.4.0/package/scripts/params.py  | 5 -
 .../RANGER/0.7.0/configuration/ranger-tagsync-site.xml  | 9 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1730747c/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 0fae23e..094d239 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -442,4 +442,7 @@ ranger_truststore_alias = 
default('/configurations/ranger-admin-site/ranger.trus
 https_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.ssl.enabled']
 http_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.http.enabled']
 https_keystore_password = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.keystore.pass']
-truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
\ No newline at end of file
+truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
+
+# need this to capture cluster name for ranger tagsync
+cluster_name = config['clusterName']
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/1730747c/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
index d186625..6391bd4 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
@@ -31,4 +31,13 @@
 Keystore and truststore information used for tagsync, 
required if tagsync to atlas communication is SSL enabled
 
   
+  
+ranger.tagsync.atlas.default.cluster.name
+{{cluster_name}}
+Capture cluster name
+
+  true
+
+
+  
 
\ No newline at end of file

[2/3] ambari git commit: AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 (Jeff Zhang via alejandro)

2017-04-05 Thread smohanty

AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 
(Jeff Zhang via alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7fbec01c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7fbec01c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7fbec01c

Branch: refs/heads/branch-2.5
Commit: 7fbec01c4eb1f947ca03fae4c6f83081cec26f10
Parents: 1730747
Author: Alejandro Fernandez 
Authored: Fri Mar 24 15:48:36 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:57:01 2017 -0700

--
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml| 4 
 .../resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml   | 1 +
 3 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 4a6e98b..95040aa 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -75,6 +75,10 @@
 
 
   
+  
+livy-env
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 97fb768..4c7faf1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -564,6 +564,10 @@
 
   
 
+  
+
+  
+
   
 
   Add queue customization property

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index fe25928..11d24c9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -881,6 +881,7 @@
   
 
   
+

[2/2] ambari git commit: AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI.

2017-04-05 Thread smohanty

AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44b5155f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44b5155f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44b5155f

Branch: refs/heads/branch-2.5
Commit: 44b5155fc0bdebd359143063524d90f14bf8572a
Parents: 84ba22a
Author: Swapan Shridhar 
Authored: Thu Mar 23 18:29:06 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:50:34 2017 -0700

--
 .../stacks/HDP/2.5/services/stack_advisor.py  | 10 --
 .../stacks/2.5/common/test_stack_advisor.py   | 18 +-
 2 files changed, 13 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/44b5155f/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 3100125..b6aca4c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -1495,12 +1495,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 
 :type yarn_min_container_size int
 """
-if yarn_min_container_size > 1024:
+if yarn_min_container_size >= 1024:
   return 1024
-if yarn_min_container_size >= 256 and yarn_min_container_size <= 1024:
-  return yarn_min_container_size
-if yarn_min_container_size < 256:
-  return 256
+else:
+  return 512
 
   def calculate_tez_am_container_size(self, services, total_cluster_capacity, 
is_cluster_create_opr=False, enable_hive_interactive_1st_invocation=False):
 """
@@ -1511,7 +1509,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 calculated_tez_am_resource_memory_mb = None
 if is_cluster_create_opr or enable_hive_interactive_1st_invocation:
   if total_cluster_capacity <= 4096:
-calculated_tez_am_resource_memory_mb = 256
+calculated_tez_am_resource_memory_mb = 512
   elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304:
 calculated_tez_am_resource_memory_mb = 1024
   elif total_cluster_capacity > 98304:

http://git-wip-us.apache.org/repos/asf/ambari/blob/44b5155f/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index 42047d9..8576dcc 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -1401,19 +1401,19 @@ class TestHDP25StackAdvisor(TestCase):
 
self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
 3)
 
self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes_for_llap_daemons'],
 3)
 
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '9548')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '9207')
 
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
 '1')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
 '1')
 
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '8524')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '8183')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
 'true')
 
 
self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
 '819')
 
self.assertEqual(configurations['hive-interactive-env']['properties']['hive_heapsize'],
 '2048')
 
self.assertEqual(configurations['hive-interactive-env']['property_attributes']['num_llap_nodes'],
 {'read_only': 'true', 'minimum': '1', 'maximum': '1'})
 
-
self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'],
 '341')
+
self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'],
 '682')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'],
 '286261248')

[1/2] ambari git commit: AMBARI-20537. Some config changes for LLAP to avoid daemon getting killed (Prasanth Jayachandran via smohanty)

2017-04-05 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4bb66330c -> 44b5155fc


AMBARI-20537. Some config changes for LLAP to avoid daemon getting killed 
(Prasanth Jayachandran via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84ba22a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84ba22a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84ba22a7

Branch: refs/heads/branch-2.5
Commit: 84ba22a711bf89b3286c155ec99f638414079d6b
Parents: 4bb6633
Author: Sumit Mohanty 
Authored: Thu Mar 23 18:11:55 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:49:41 2017 -0700

--
 .../2.5/services/HIVE/configuration/hive-interactive-env.xml| 2 +-
 .../2.5/services/HIVE/configuration/tez-interactive-site.xml| 5 +
 .../2.6/services/HIVE/configuration/hive-interactive-env.xml| 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 07d21af..f3e7be1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -201,7 +201,7 @@
   
   
 llap_java_opts
--XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=40 
-XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails 
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}
+-XX:+AlwaysPreTouch {% if java_version > 7 %}-Xss512k -XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=40 
-XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails 
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}
 Java opts for llap daemons
 LLAP daemon java opts
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
index e914d69..c1a42b0 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
@@ -178,4 +178,9 @@
 3600
 
   
+  
+tez.runtime.shuffle.parallel.copies
+8
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
index a99caba..ada4859 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
@@ -44,7 +44,7 @@
   
   
 llap_java_opts
--XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 
-XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc 
-XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}{{heap_dump_opts}}
+-XX:+AlwaysPreTouch {% if java_version > 7 %}-Xss512k -XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 
-XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc 
-XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}{{heap_dump_opts}}
 Java opts for llap application
 LLAP app java opts

ambari git commit: AMBARI-20667 : Storm metrics sink can't connect Ambari metrics collector. (Jungtaek Lim via avijayan)

2017-04-05 Thread avijayan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c924df606 -> 4bb66330c


AMBARI-20667 : Storm metrics sink can't connect Ambari metrics collector. 
(Jungtaek Lim via avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bb66330
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bb66330
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bb66330

Branch: refs/heads/branch-2.5
Commit: 4bb66330cd494813d2fd32e5df3afca1ff5da2a0
Parents: c924df6
Author: Aravindan Vijayan 
Authored: Wed Apr 5 10:55:45 2017 -0700
Committer: Aravindan Vijayan 
Committed: Wed Apr 5 10:55:45 2017 -0700

--
 .../hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4bb66330/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
index c70fff7..f58f549 100644
--- 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
@@ -71,7 +71,7 @@ public class StormTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 
   @Override
   protected String getCollectorUri(String host) {
-return collectorUri;
+return constructTimelineMetricUri(protocol, host, port);
   }
 
   @Override
@@ -137,7 +137,7 @@ public class StormTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 // Initialize the collector write strategy
 super.init();
 
-if (protocol.toLowerCase().startsWith("https://;)) {
+if (protocol.contains("https")) {
   String trustStorePath = 
configuration.getProperty(SSL_KEYSTORE_PATH_PROPERTY).trim();
   String trustStoreType = 
configuration.getProperty(SSL_KEYSTORE_TYPE_PROPERTY).trim();
   String trustStorePwd = 
configuration.getProperty(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
@@ -328,7 +328,7 @@ public class StormTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
   }
 
   private TimelineMetric createTimelineMetric(long currentTimeMillis, String 
hostName,
-  String attributeName, Double attributeValue) {
+  String attributeName, Double 
attributeValue) {
 TimelineMetric timelineMetric = new TimelineMetric();
 timelineMetric.setMetricName(attributeName);
 timelineMetric.setHostName(hostName);

ambari git commit: AMBARI-20683 Reduce size of persisted configurations in wizards. (atkach)

2017-04-05 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/trunk 6c0b38e00 -> 7d0baec7d


AMBARI-20683 Reduce size of persisted configurations in wizards. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d0baec7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d0baec7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d0baec7

Branch: refs/heads/trunk
Commit: 7d0baec7d7ddad29a6955f3af2ff6f020136abcd
Parents: 6c0b38e
Author: Andrii Tkach 
Authored: Wed Apr 5 16:25:23 2017 +0300
Committer: Andrii Tkach 
Committed: Wed Apr 5 16:25:23 2017 +0300

--
 ambari-web/app/controllers/installer.js | 15 +++--
 .../main/admin/kerberos/wizard_controller.js| 18 +++---
 .../controllers/main/service/add_controller.js  | 43 +-
 ambari-web/app/controllers/wizard.js| 61 +++-
 ambari-web/app/routes/add_kerberos_routes.js| 22 ---
 ambari-web/app/routes/add_service_routes.js | 16 +++--
 ambari-web/app/routes/installer.js  | 25 
 ambari-web/test/controllers/installer_test.js   | 17 --
 ambari-web/test/controllers/wizard_test.js  | 47 ++-
 ambari-web/test/init_test.js| 25 
 10 files changed, 176 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d0baec7/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 0946ed8..369e163 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -1022,14 +1022,13 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
 callback: function () {
   var dfd = $.Deferred();
   var self = this;
-  this.loadServiceConfigProperties().always(function() {
-self.loadServiceConfigGroups();
-self.loadCurrentHostGroups();
-self.loadRecommendationsConfigs();
-self.loadComponentsFromConfigs();
-self.loadConfigThemes().then(function() {
-  dfd.resolve();
-});
+  this.loadServiceConfigGroups();
+  this.loadCurrentHostGroups();
+  this.loadRecommendationsConfigs();
+  this.loadComponentsFromConfigs();
+  this.loadConfigThemes().then(function() {
+self.loadServiceConfigProperties();
+dfd.resolve();
   });
   return dfd.promise();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d0baec7/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js 
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 93ffcaa..64b2065 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -280,19 +280,15 @@ App.KerberosWizardController = 
App.WizardController.extend(App.InstallComponent,
 ],
 '2': [
   {
-type: 'async',
+type: 'sync',
 callback: function () {
   var self = this;
-  var dfd = $.Deferred();
-  this.loadServiceConfigProperties().always(function() {
-if (!self.get('stackConfigsLoaded')) {
-  
App.config.loadConfigsFromStack(['KERBEROS']).complete(function() {
-self.set('stackConfigsLoaded', true);
-  }, self);
-}
-dfd.resolve();
-  });
-  return dfd.promise();
+  this.loadServiceConfigProperties();
+  if (!self.get('stackConfigsLoaded')) {
+App.config.loadConfigsFromStack(['KERBEROS']).complete(function() {
+  self.set('stackConfigsLoaded', true);
+}, self);
+  }
 }
   }
 ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d0baec7/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js 
b/ambari-web/app/controllers/main/service/add_controller.js
index dc8f76c..ee7719c 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -126,10 +126,9 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   this.loadKerberosDescriptorConfigs().done(function() {
 self.loadServiceConfigGroups();

ambari git commit: AMBARI-20681 Select Version step of installer: repo URL validation message issues. (ababiichuk)

2017-04-05 Thread ababiichuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 3b2553343 -> 6c0b38e00


AMBARI-20681 Select Version step of installer: repo URL validation message 
issues. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c0b38e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c0b38e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c0b38e0

Branch: refs/heads/trunk
Commit: 6c0b38e00b49eb1f7ac879053ee161496c971a3f
Parents: 3b25533
Author: ababiichuk 
Authored: Wed Apr 5 15:05:29 2017 +0300
Committer: ababiichuk 
Committed: Wed Apr 5 15:05:29 2017 +0300

--
 ambari-web/app/views/wizard/step1_view.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6c0b38e0/ambari-web/app/views/wizard/step1_view.js
--
diff --git a/ambari-web/app/views/wizard/step1_view.js 
b/ambari-web/app/views/wizard/step1_view.js
index 0161985..584f621 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -213,9 +213,12 @@ App.WizardStep1View = Em.View.extend({
   popoverView: Em.View.extend({
 tagName: 'i',
 classNameBindings: ['repository.validationClassName'],
-attributeBindings: ['repository.errorTitle:title', 
'repository.errorContent:data-content'],
+attributeBindings: ['repository.errorTitle:data-original-title', 
'repository.errorContent:data-content'],
 didInsertElement: function () {
-  App.popover($(this.get('element')), {'trigger': 'hover'});
+  App.popover($(this.get('element')), {
+template: '',
+trigger: 'hover'
+  });
 }
   }),

ambari git commit: AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a longer query (pallavkul)

2017-04-05 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 cfb1bcc7e -> c924df606


AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a 
longer query (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c924df60
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c924df60
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c924df60

Branch: refs/heads/branch-2.5
Commit: c924df6066a16c1161bbf9155963b130825e2e04
Parents: cfb1bcc
Author: pallavkul 
Authored: Wed Apr 5 11:33:30 2017 +0530
Committer: pallavkul 
Committed: Wed Apr 5 11:34:36 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/styles/app.scss | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c924df60/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index c06e65e..f4b63c5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -973,3 +973,7 @@ rect.operator__box {
   bottom:10px;
   right:-15px;
 }
+
+.CodeMirror-scroll {
+  padding-bottom: 20px;
+}

ambari git commit: AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a longer query (pallavkul)

2017-04-05 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/trunk b4fc47f5e -> 3b2553343


AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a 
longer query (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b255334
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b255334
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b255334

Branch: refs/heads/trunk
Commit: 3b25533430a181b6b83f4f1cf665c8f9aceafd4e
Parents: b4fc47f
Author: pallavkul 
Authored: Wed Apr 5 11:33:30 2017 +0530
Committer: pallavkul 
Committed: Wed Apr 5 11:33:30 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/styles/app.scss | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3b255334/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index c06e65e..f4b63c5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -973,3 +973,7 @@ rect.operator__box {
   bottom:10px;
   right:-15px;
 }
+
+.CodeMirror-scroll {
+  padding-bottom: 20px;
+}

ambari git commit: AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics (vivekratnavel)

ambari git commit: AMBARI-20548. Grafana dashboard changes for some new llap daemon metrics (vivekratnavel)

ambari git commit: AMBARI-20429. Warn users about pending requests while trying to enable Interactive Query immediately after disabling it (vivekratnavel)

ambari git commit: AMBARI-20612. Fetching running application logs results in java.io.IOException (Madhuvanthi Radhakrishnan via smohanty)

ambari git commit: AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth Seth via smohanty)

[3/3] ambari git commit: AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh deployments (smohanty)

[1/3] ambari git commit: AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated atlas tags (Vishal Suvagia via smohanty)

[2/3] ambari git commit: AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 (Jeff Zhang via alejandro)

[2/2] ambari git commit: AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI.

[1/2] ambari git commit: AMBARI-20537. Some config changes for LLAP to avoid daemon getting killed (Prasanth Jayachandran via smohanty)

ambari git commit: AMBARI-20667 : Storm metrics sink can't connect Ambari metrics collector. (Jungtaek Lim via avijayan)

ambari git commit: AMBARI-20683 Reduce size of persisted configurations in wizards. (atkach)

ambari git commit: AMBARI-20681 Select Version step of installer: repo URL validation message issues. (ababiichuk)

ambari git commit: AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a longer query (pallavkul)

ambari git commit: AMBARI-20660. HiveView2.0 scrolling in query tab does not work properly for a longer query (pallavkul)

15 matches

Site Navigation

Mail list logo

Footer information