[ambari] branch trunk updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 40aac82 [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in
YARN conf… (#2016)
40aac82 is described below
commit 40aac8240bb516cf1048afd0642e1e7d6dc2027f
Author: Ishan Bhatt
AuthorDate: Thu Aug 9 17:12:07 2018 -0700
[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf…
(#2016)
* [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs
while enabling HSI.
* Changed function parameters info
---
.../common/configs/config_recommendation_parser.js | 45 ++
1 file changed, 45 insertions(+)
diff --git
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 74aeacd..19ea8a5 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -169,9 +169,15 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
allowConfigUpdate = false;
}
}
+
if (prevRecommeneded !== value) {
allowConfigUpdate = false;
}
+
+ if (name === "capacity-scheduler") {
+allowConfigUpdate =
this.compareCapacitySchedulerValues(prevRecommeneded, value);
+ }
+
if (allowConfigUpdate) {
Em.setProperties(config, {
value: recommendedValue,
@@ -192,6 +198,45 @@ App.ConfigRecommendationParser =
Em.Mixin.create(App.ConfigRecommendations, {
},
/**
+ * Configs with value across multiple lines could have them in a different
order
+ * Eg: capacity-scheduler
+ *
+ * @param {String} prevRec
+ * @param {String} value
+ * @returns {Boolean}
+ * @method isPrevRecAndValueEqual
+ */
+
+ compareCapacitySchedulerValues: function (prevRec, value) {
+
+
+let prevRecArr = prevRec.split("\n");
+let valueArr = value.split("\n");
+
+//first value being added is capacity-scheduler=null. Remove that for
comparison
+if (valueArr[0].includes("capacity-scheduler")) {
+ valueArr = valueArr.splice(1);
+}
+
+if (prevRecArr.length !== valueArr.length) {
+ return false;
+}
+if (prevRecArr.length < 2 || valueArr.length < 2) {
+ return prevRec === value;
+}
+let strMap = {};
+for (var i=0; i
[ambari] branch branch-2.7 updated: [AMBARI-24447] No subject alternative DNS name exception encountered when Enabling Kerberos against an Active Directory even when SSL verification is off
This is an automated email from the ASF dual-hosted git repository.
rlevas pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 2df0421 [AMBARI-24447] No subject alternative DNS name exception
encountered when Enabling Kerberos against an Active Directory even when SSL
verification is off
2df0421 is described below
commit 2df042144662f26faf256484e30f2059d2ab89ce
Author: Robert Levas
AuthorDate: Thu Aug 9 13:02:46 2018 -0400
[AMBARI-24447] No subject alternative DNS name exception encountered when
Enabling Kerberos against an Active Directory even when SSL verification is off
---
.../server/security/InternalSSLSocketFactory.java | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
index 9ecf5d1..fa67889 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
@@ -26,8 +26,10 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
import javax.net.ssl.X509TrustManager;
/**
@@ -94,9 +96,9 @@ public class InternalSSLSocketFactory extends
SSLSocketFactory {
/**
* LenientTrustManager is a TrustManager that accepts all certificates
without validating the
- * chain of trust.
+ * chain of trust or hostname.
*/
- public static class LenientTrustManager implements X509TrustManager {
+ public static class LenientTrustManager extends X509ExtendedTrustManager
implements X509TrustManager {
public void checkClientTrusted(X509Certificate[] xcs, String string)
throws CertificateException {
// do nothing
}
@@ -108,5 +110,25 @@ public class InternalSSLSocketFactory extends
SSLSocketFactory {
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
+
+@Override
+public void checkClientTrusted(X509Certificate[] x509Certificates, String
s, Socket socket) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkServerTrusted(X509Certificate[] x509Certificates, String
s, Socket socket) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkClientTrusted(X509Certificate[] x509Certificates, String
s, SSLEngine sslEngine) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkServerTrusted(X509Certificate[] x509Certificates, String
s, SSLEngine sslEngine) throws CertificateException {
+ // do nothing
+}
}
}
\ No newline at end of file
[ambari] branch trunk updated: [AMBARI-24447] No subject alternative DNS name exception encountered when Enabling Kerberos against an Active Directory even when SSL verification is off
This is an automated email from the ASF dual-hosted git repository.
rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new fc6e964 [AMBARI-24447] No subject alternative DNS name exception
encountered when Enabling Kerberos against an Active Directory even when SSL
verification is off
fc6e964 is described below
commit fc6e964f5e447b1368569e455a545b8c8350cbd0
Author: Robert Levas
AuthorDate: Thu Aug 9 13:02:46 2018 -0400
[AMBARI-24447] No subject alternative DNS name exception encountered when
Enabling Kerberos against an Active Directory even when SSL verification is off
---
.../server/security/InternalSSLSocketFactory.java | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
index 9ecf5d1..fa67889 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
@@ -26,8 +26,10 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
import javax.net.ssl.X509TrustManager;
/**
@@ -94,9 +96,9 @@ public class InternalSSLSocketFactory extends
SSLSocketFactory {
/**
* LenientTrustManager is a TrustManager that accepts all certificates
without validating the
- * chain of trust.
+ * chain of trust or hostname.
*/
- public static class LenientTrustManager implements X509TrustManager {
+ public static class LenientTrustManager extends X509ExtendedTrustManager
implements X509TrustManager {
public void checkClientTrusted(X509Certificate[] xcs, String string)
throws CertificateException {
// do nothing
}
@@ -108,5 +110,25 @@ public class InternalSSLSocketFactory extends
SSLSocketFactory {
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
+
+@Override
+public void checkClientTrusted(X509Certificate[] x509Certificates, String
s, Socket socket) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkServerTrusted(X509Certificate[] x509Certificates, String
s, Socket socket) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkClientTrusted(X509Certificate[] x509Certificates, String
s, SSLEngine sslEngine) throws CertificateException {
+ // do nothing
+}
+
+@Override
+public void checkServerTrusted(X509Certificate[] x509Certificates, String
s, SSLEngine sslEngine) throws CertificateException {
+ // do nothing
+}
}
}
\ No newline at end of file
[ambari] branch trunk updated: Update team page. (yusaku)
This is an automated email from the ASF dual-hosted git repository. yusaku pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 48a5c91 Update team page. (yusaku) 48a5c91 is described below commit 48a5c91183739713660eb6ecd9386b60ae173c2d Author: Yusaku Sako AuthorDate: Thu Aug 9 11:58:50 2018 -0700 Update team page. (yusaku) --- docs/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index be2cadd..dc0e097 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1347,6 +1347,10 @@ Hortonworks + Yesha Vora + Hortonworks + + Newton Alex Pivotal
svn commit: r1837758 - /ambari/site/team-list.html
Author: yusaku Date: Thu Aug 9 18:58:38 2018 New Revision: 1837758 URL: http://svn.apache.org/viewvc?rev=1837758=rev Log: Update team page. (yusaku) Modified: ambari/site/team-list.html Modified: ambari/site/team-list.html URL: http://svn.apache.org/viewvc/ambari/site/team-list.html?rev=1837758=1837757=1837758=diff == --- ambari/site/team-list.html (original) +++ ambari/site/team-list.html Thu Aug 9 18:58:38 2018 @@ -1937,204 +1937,207 @@ Sanket Shah Hortonworks +Yesha Vora +Hortonworks + Newton Alex Pivotal - + Saman Alvi Pivotal - + Jos Backus eBay - + Sandeep Baldawa - - + Daniel Ballard Pivotal - + Zachary Blanco Rutgers University - + Nadav Caspi - - + Chelsea Chang Microsoft - + Chun Chen - - + Bradley Childs Red Hat - + Nick Dimiduk Hortonworks - + Ellen Evans - - + Matthew Farrellee Red Hat - + Ahmed Fathalla - - + Andrew Grande Hortonworks - + Ximo Guanter - - + Arpit Gupta Hortonworks - + Sumit Gupta Hortonworks - + Jonathan Halterman HP - + Michael Harp Teradata - + Greg Hill Rackspace - + Krisztian Horvath Hortonworks - + Saurabh Jain - - + Ritesh Jaltare Pivotal - + Shawn Kern - - + Giridharan Kesavan Hortonworks - + Olivier Lamy - - + Brandon Li - - + Chuan Liu Microsoft - + Adamos Loizou - - + Jeff Markham Hortonworks - + Jonathan Maron Hortonworks - + Trevor McKay Red Hat - + David McWhorter - - + Rodrigo Meneses Pivotal - + Ivan Mitic Microsoft - + Mostafa Mokhtar Hortonworks - + Shantanu Mundkur - - + Thejas Nair Hortonworks - + Selvamohan Neethiraj Hortonworks - + Richard Pelavin - - + Anthony Penniston Pivotal - + Velmurugan Periasamy Hortonworks - + Rishi Pidva Pivotal - + ViVek Raghuwanshi - - + Steve Ratay Teradata - + Luciano Resende - - + Ananya Sen - - + Ashish Singh Hortonworks - + Sreenath Somarajapuram Hortonworks - + Mahesh Kumar Vasanthu Somashekar Pivotal - + Suresh Srinivas Hortonworks - + Vijay Srinivasaraghavan EMC - + Vivek Ratnavel Subramanian Hortonworks - + Pramod Thangali Hortonworks - + Thulasi Pivotal - + Sunitha Velpula Hortonworks - + Ram Venkatesh Hortonworks - + Ivan Wang Pivotal - + Adam Westerman - - + Eron Wright EMC - + Pengcheng Xu Carnegie Mellon University - + Ted Yu Hortonworks - + Zhan Zhang Hortonworks - + Cabir Zounaidou Hortonworks - + Dharmesh Makwana - - + Hayat Behlim
svn commit: r1837754 - in /ambari/site: index.html install-0.9.html install.html irc.html issue-tracking.html license.html mail-lists.html privacy-policy.html project-info.html team-list.html whats-ne
Author: yusaku Date: Thu Aug 9 18:52:16 2018 New Revision: 1837754 URL: http://svn.apache.org/viewvc?rev=1837754=rev Log: Update team page. (yusaku) Modified: ambari/site/index.html ambari/site/install-0.9.html ambari/site/install.html ambari/site/irc.html ambari/site/issue-tracking.html ambari/site/license.html ambari/site/mail-lists.html ambari/site/privacy-policy.html ambari/site/project-info.html ambari/site/team-list.html ambari/site/whats-new.html Modified: ambari/site/index.html URL: http://svn.apache.org/viewvc/ambari/site/index.html?rev=1837754=1837753=1837754=diff == --- ambari/site/index.html (original) +++ ambari/site/index.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/install-0.9.html URL: http://svn.apache.org/viewvc/ambari/site/install-0.9.html?rev=1837754=1837753=1837754=diff == --- ambari/site/install-0.9.html (original) +++ ambari/site/install-0.9.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/install.html URL: http://svn.apache.org/viewvc/ambari/site/install.html?rev=1837754=1837753=1837754=diff == --- ambari/site/install.html (original) +++ ambari/site/install.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/irc.html URL: http://svn.apache.org/viewvc/ambari/site/irc.html?rev=1837754=1837753=1837754=diff == --- ambari/site/irc.html (original) +++ ambari/site/irc.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/issue-tracking.html URL: http://svn.apache.org/viewvc/ambari/site/issue-tracking.html?rev=1837754=1837753=1837754=diff == --- ambari/site/issue-tracking.html (original) +++ ambari/site/issue-tracking.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - Issue Tracking @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/license.html URL: http://svn.apache.org/viewvc/ambari/site/license.html?rev=1837754=1837753=1837754=diff == --- ambari/site/license.html (original) +++ ambari/site/license.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Ambari - Project License @@ -409,7 +409,7 @@ - Last Published: 2018-07-18 | + Last Published: 2018-08-09 | Version: 2.7.0 Modified: ambari/site/mail-lists.html URL: http://svn.apache.org/viewvc/ambari/site/mail-lists.html?rev=1837754=1837753=1837754=diff == --- ambari/site/mail-lists.html (original) +++ ambari/site/mail-lists.html Thu Aug 9 18:52:16 2018 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en"
[ambari] branch trunk updated: Update team page. (yusaku)
This is an automated email from the ASF dual-hosted git repository. yusaku pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 12278d8 Update team page. (yusaku) 12278d8 is described below commit 12278d8f59d0042b6e9ab6ecbbc971a4af52c3f7 Author: Yusaku Sako AuthorDate: Thu Aug 9 11:47:58 2018 -0700 Update team page. (yusaku) --- docs/pom.xml | 28 1 file changed, 28 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 2b90e01..be2cadd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1315,6 +1315,34 @@ + Dhanya Balasundaran + Hortonworks + + + Jasmeen Kaur + Hortonworks + + + Kishor Ramakrishnan + Hortonworks + + + Pradarttana Panda + Hortonworks + + + Srikanth Janardhan + Hortonworks + + + Vivek Rathod + Hortonworks + + + Vivek Sharma + Hortonworks + + Sanket Shah Hortonworks
[ambari] branch branch-2.7 updated: [AMBARI-24367] Fix integration test regressions in AMS collector due to scale changes (#2011)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 5e3d86b [AMBARI-24367] Fix integration test regressions in AMS
collector due to scale changes (#2011)
5e3d86b is described below
commit 5e3d86b92fc5cc95275e384c94d98940ac973c17
Author: avijayanhwx
AuthorDate: Thu Aug 9 11:10:20 2018 -0700
[AMBARI-24367] Fix integration test regressions in AMS collector due to
scale changes (#2011)
* AMBARI-24367 : Fix integration test regressions in AMS collector due to
scale changes.
* AMBARI-24367 : Fix integration test regressions in AMS collector due to
scale changes (2).
---
.../TimelineMetricClusterAggregator.java | 2 +-
.../TimelineMetricClusterAggregatorSecond.java | 12 +-
.../discovery/TimelineMetricMetadataManager.java | 20 +--
.../timeline/AbstractMiniHBaseClusterTest.java | 54
.../core/timeline/ITPhoenixHBaseAccessor.java | 13 +-
.../metrics/core/timeline/MetricTestHelper.java| 43 +++---
.../timeline/StandaloneHBaseTestingUtility.java| 39 ++
.../timeline/aggregators/ITClusterAggregator.java | 146 ++---
.../timeline/aggregators/ITMetricAggregator.java | 88 +
9 files changed, 307 insertions(+), 110 deletions(-)
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
index 357e0ba..9753f89 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
@@ -136,7 +136,7 @@ public class TimelineMetricClusterAggregator extends
AbstractTimelineAggregator
}
if (existingMetric != null) {
- hostAggregate.setSum(hostAggregate.getSum() / perMetricCount);
+ hostAggregate.setSum(hostAggregate.getSum() / (perMetricCount - 1));
hostAggregate.setNumberOfSamples(Math.round((float)hostAggregate.getNumberOfSamples()
/ (float)perMetricCount));
}
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
index 878dcb3..785b416 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
@@ -21,6 +21,7 @@ package org.apache.ambari.metrics.core.timeline.aggregators;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.SERVER_SIDE_TIMESIFT_ADJUSTMENT;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_CLUSTER_AGGREGATOR_INTERPOLATION_ENABLED;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_EVENT_METRIC_PATTERNS;
+import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_SUPPORT_MULTIPLE_CLUSTERS;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRIC_AGGREGATION_SQL_FILTERS;
import static
org.apache.ambari.metrics.core.timeline.aggregators.AggregatorUtils.getTimeSlices;
import static
org.apache.ambari.metrics.core.timeline.aggregators.AggregatorUtils.sliceFromTimelineMetric;
@@ -99,7 +100,11 @@ public class TimelineMetricClusterAggregatorSecond extends
AbstractTimelineAggre
skipInterpolationMetricPatterns.addAll(getJavaMetricPatterns(skipInterpolationMetricPatternStrings));
}
-this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager);
+if
(Boolean.valueOf(metricsConf.get(TIMELINE_METRICS_SUPPORT_MULTIPLE_CLUSTERS,
"false"))) {
+ this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager, true);
+} else {
+ this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager);
+}
}
@Override
@@ -153,6 +158,9 @@ public class TimelineMetricClusterAggregatorSecond extends
AbstractTimelineAggre
Map hostedAppCounter = new HashMap<>();
if (rs.next()) {
metric =
[ambari] branch trunk updated: AMBARI-24367 : Fix integration test regressions in AMS collector due to scale changes (#1919)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 918795a AMBARI-24367 : Fix integration test regressions in AMS
collector due to scale changes (#1919)
918795a is described below
commit 918795a3d91d001b8cd8e1ef48c5b1480beedd8b
Author: avijayanhwx
AuthorDate: Thu Aug 9 10:05:43 2018 -0700
AMBARI-24367 : Fix integration test regressions in AMS collector due to
scale changes (#1919)
* AMBARI-24367 : Fix integration test regressions in AMS collector due to
scale changes.
* AMBARI-24367 : Fix integration test regressions in AMS collector due to
scale changes (2).
---
.../TimelineMetricClusterAggregator.java | 2 +-
.../TimelineMetricClusterAggregatorSecond.java | 12 +-
.../discovery/TimelineMetricMetadataManager.java | 20 +--
.../timeline/AbstractMiniHBaseClusterTest.java | 54
.../core/timeline/ITPhoenixHBaseAccessor.java | 13 +-
.../metrics/core/timeline/MetricTestHelper.java| 43 +++---
.../timeline/StandaloneHBaseTestingUtility.java| 39 ++
.../timeline/aggregators/ITClusterAggregator.java | 146 ++---
.../timeline/aggregators/ITMetricAggregator.java | 88 +
9 files changed, 307 insertions(+), 110 deletions(-)
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
index 357e0ba..9753f89 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregator.java
@@ -136,7 +136,7 @@ public class TimelineMetricClusterAggregator extends
AbstractTimelineAggregator
}
if (existingMetric != null) {
- hostAggregate.setSum(hostAggregate.getSum() / perMetricCount);
+ hostAggregate.setSum(hostAggregate.getSum() / (perMetricCount - 1));
hostAggregate.setNumberOfSamples(Math.round((float)hostAggregate.getNumberOfSamples()
/ (float)perMetricCount));
}
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
index 878dcb3..785b416 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/TimelineMetricClusterAggregatorSecond.java
@@ -21,6 +21,7 @@ package org.apache.ambari.metrics.core.timeline.aggregators;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.SERVER_SIDE_TIMESIFT_ADJUSTMENT;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_CLUSTER_AGGREGATOR_INTERPOLATION_ENABLED;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_EVENT_METRIC_PATTERNS;
+import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_SUPPORT_MULTIPLE_CLUSTERS;
import static
org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration.TIMELINE_METRIC_AGGREGATION_SQL_FILTERS;
import static
org.apache.ambari.metrics.core.timeline.aggregators.AggregatorUtils.getTimeSlices;
import static
org.apache.ambari.metrics.core.timeline.aggregators.AggregatorUtils.sliceFromTimelineMetric;
@@ -99,7 +100,11 @@ public class TimelineMetricClusterAggregatorSecond extends
AbstractTimelineAggre
skipInterpolationMetricPatterns.addAll(getJavaMetricPatterns(skipInterpolationMetricPatternStrings));
}
-this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager);
+if
(Boolean.valueOf(metricsConf.get(TIMELINE_METRICS_SUPPORT_MULTIPLE_CLUSTERS,
"false"))) {
+ this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager, true);
+} else {
+ this.timelineMetricReadHelper = new
TimelineMetricReadHelper(metadataManager);
+}
}
@Override
@@ -153,6 +158,9 @@ public class TimelineMetricClusterAggregatorSecond extends
AbstractTimelineAggre
Map hostedAppCounter = new HashMap<>();
if (rs.next()) {
metric =
[ambari] branch branch-2.7 updated: [AMBARI-24415] Remove dependencies with CVE issues from Ambari Server
This is an automated email from the ASF dual-hosted git repository.
rlevas pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 3a691dd [AMBARI-24415] Remove dependencies with CVE issues from
Ambari Server
3a691dd is described below
commit 3a691ddb39f6fae45921cb20a7af65879aa7462b
Author: Robert Levas
AuthorDate: Wed Aug 8 11:08:23 2018 -0400
[AMBARI-24415] Remove dependencies with CVE issues from Ambari Server
---
ambari-project/pom.xml | 11 ++-
ambari-server/pom.xml | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index ba98a7c..a2eb328 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -37,7 +37,8 @@
3.1.4
1.7.20
4.1.0
-4.3.16.RELEASE
+4.3.17.RELEASE
+4.2.7.RELEASE
2.9.5
42.2.2
4
@@ -163,17 +164,17 @@
org.springframework.security
spring-security-core
-4.2.4.RELEASE
+${spring.security.version}
org.springframework.security
spring-security-config
-4.2.4.RELEASE
+${spring.security.version}
org.springframework.security
spring-security-web
-4.2.4.RELEASE
+${spring.security.version}
org.springframework.security.kerberos
@@ -189,7 +190,7 @@
org.springframework.security
spring-security-ldap
-4.1.1.RELEASE
+${spring.security.version}
org.springframework.ldap
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 5f0e10b..142e6c4 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1732,7 +1732,7 @@
com.jcraft
jsch
- 0.1.45
+ 0.1.54
org.eclipse.jetty
@@ -1791,7 +1791,7 @@
org.kohsuke
libpam4j
- 1.8
+ 1.10
net.java.dev.jna
[ambari] branch trunk updated: AMBARI-24442. HIVESERVER2 JDBC URL doesn't fit inside block (akovalenko)
This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1b20bcd AMBARI-24442. HIVESERVER2 JDBC URL doesn't fit inside block
(akovalenko)
1b20bcd is described below
commit 1b20bcd902f57041b2a20925a713817737ef7547
Author: Aleksandr Kovalenko
AuthorDate: Thu Aug 9 14:22:11 2018 +0300
AMBARI-24442. HIVESERVER2 JDBC URL doesn't fit inside block (akovalenko)
---
ambari-web/app/styles/application.less | 1 +
1 file changed, 1 insertion(+)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 3f8bd9a..37fd1dc 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -905,6 +905,7 @@ a:focus {
display: inline-block;
&.endpoint-value {
padding-left: 30px;
+word-break: break-word;
}
.clip-board{
margin-left: 5px;
[ambari] 01/01: Merge pull request #2004 from hiveww/AMBARI-24432-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 2ad598f300ababc6728a595434b181c8cdb5dc7f Merge: c9965c0 b1c243f Author: Alexander Antonenko AuthorDate: Thu Aug 9 17:29:01 2018 +0300 Merge pull request #2004 from hiveww/AMBARI-24432-trunk AMBARI-24432. Cover federation wizard controller with tests ambari-web/app/assets/test/tests.js| 1 + .../admin/federation/wizard_controller_test.js | 120 + 2 files changed, 121 insertions(+)
[ambari] branch trunk updated (c9965c0 -> 2ad598f)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from c9965c0 [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent add 7c6b099 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ambari into trunk add 1ca963c AMBARI-24432. Cover federation wizardcontroller with tests add b1c243f Merge branch 'trunk' into AMBARI-24432-trunk new 2ad598f Merge pull request #2004 from hiveww/AMBARI-24432-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/assets/test/tests.js| 1 + .../admin/federation/wizard_controller_test.js | 120 + 2 files changed, 121 insertions(+) create mode 100644 ambari-web/test/controllers/main/admin/federation/wizard_controller_test.js
[ambari] branch branch-2.7 updated: [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent
This is an automated email from the ASF dual-hosted git repository. rlevas pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/branch-2.7 by this push: new cb1794e [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent cb1794e is described below commit cb1794e998d79aa755e4ac7e27cd0f0cf57ffb0e Author: Robert Levas AuthorDate: Wed Aug 8 14:04:43 2018 -0400 [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent --- contrib/views/utils/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml index a2990e4..4bb144d 100644 --- a/contrib/views/utils/pom.xml +++ b/contrib/views/utils/pom.xml @@ -131,11 +131,6 @@ test - org.apache.commons - commons-collections4 - 4.0 - - org.glassfish.jersey.test-framework.providers
[ambari] branch trunk updated: [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent
This is an automated email from the ASF dual-hosted git repository. rlevas pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new c9965c0 [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent c9965c0 is described below commit c9965c0667f1c8a8f03ff209d6b91a065d32bf9a Author: Robert Levas AuthorDate: Wed Aug 8 14:04:43 2018 -0400 [AMBARI-24429] Remove dependencies with CVE issues from Ambari Agent --- contrib/views/utils/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml index 82b87c8..bfb1ae1 100644 --- a/contrib/views/utils/pom.xml +++ b/contrib/views/utils/pom.xml @@ -131,11 +131,6 @@ test - org.apache.commons - commons-collections4 - 4.0 - - org.glassfish.jersey.test-framework.providers
[ambari] branch trunk updated: AMBARI-24443. Slider type widget displays erroneously before first touch (akovalenko)
This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 514db78 AMBARI-24443. Slider type widget displays erroneously before
first touch (akovalenko)
514db78 is described below
commit 514db78c27a70c2883392b9c26728fd3eb341b06
Author: Aleksandr Kovalenko
AuthorDate: Thu Aug 9 14:06:53 2018 +0300
AMBARI-24443. Slider type widget displays erroneously before first touch
(akovalenko)
---
.../app/views/common/configs/widgets/slider_config_widget_view.js | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 5c8ea78..21d6f68 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -419,6 +419,13 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
*/
var correctConfigValue = this.get('config.value');
+// workaround for cases when slider input is hidden in DOM
+try {
+ $(this.get('element')).find('.ui-slider-wrapper').removeClass('hide');
+} catch (e) {
+ console.error('Error when trying to show slider input');
+}
+
var slider = new Slider(this.$('input.slider-input')[0], {
value: this.get('mirrorValue'),
ticks: ticks,
[ambari] branch trunk updated (8a740f2 -> f3ee18e)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 8a740f2 AMBARI-24431. Infra Manager / Log Search: Fix Jetty CVE-2018-12536. (#2002) add 853ac14 AMBARI-24412. Unit tests for federation step 4 controller new f3ee18e Merge pull request #1982 from hiveww/AMBARI-24412-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/assets/test/tests.js| 1 + .../main/admin/federation/step4_controller_test.js | 259 + 2 files changed, 260 insertions(+) create mode 100644 ambari-web/test/controllers/main/admin/federation/step4_controller_test.js
[ambari] 01/01: Merge pull request #1982 from hiveww/AMBARI-24412-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit f3ee18e32276f7d4c9d196741b975ad501e3d1b8 Merge: 8a740f2 853ac14 Author: Alexander Antonenko AuthorDate: Thu Aug 9 10:01:45 2018 +0300 Merge pull request #1982 from hiveww/AMBARI-24412-trunk AMBARI-24412. Unit tests for federation step 4 controller ambari-web/app/assets/test/tests.js| 1 + .../main/admin/federation/step4_controller_test.js | 259 + 2 files changed, 260 insertions(+)
