[ambari] branch branch-2.7 updated: Fix ConcurrentModificationException in HostRequest.getPhysicalTaskMapping (#3281)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 00443cd Fix ConcurrentModificationException in
HostRequest.getPhysicalTaskMapping (#3281)
00443cd is described below
commit 00443cdf7c858be31ee8b4d81b5adbd24eb83f52
Author: Suraj Naik
AuthorDate: Mon Feb 1 20:12:11 2021 +
Fix ConcurrentModificationException in HostRequest.getPhysicalTaskMapping
(#3281)
Co-authored-by: Suraj Naik
Co-authored-by: Ramkrishna Vasudevan
Co-authored-by: Ramkrishna Vasudevan
---
.../src/main/java/org/apache/ambari/server/topology/HostRequest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
index 13f89b5..62321c4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
@@ -81,7 +82,7 @@ public class HostRequest implements Comparable {
Map logicalTasks = new HashMap<>();
// logical task id -> physical tasks
- private Map physicalTasks = new HashMap<>();
+ private Map physicalTasks = new ConcurrentHashMap<>();
private List topologyTasks = new ArrayList<>();
@@ -455,7 +456,7 @@ public class HostRequest implements Comparable
{
}
public Map getPhysicalTaskMapping() {
-return new HashMap<>(physicalTasks);
+return new ConcurrentHashMap<>(physicalTasks);
}
//todo: since this is used to determine equality, using hashCode() isn't
safe as it can return the same
[ambari] branch branch-2.7 updated: AMBARI-25571. Vulnerable Spring components in Ambari - CVE-2020-5398, CVE-2020-5421 (dlysnichenko) (#3246)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 0740dce AMBARI-25571. Vulnerable Spring components in Ambari - CVE-2020-5398, CVE-2020-5421 (dlysnichenko) (#3246) 0740dce is described below commit 0740dce35dd4af783c357d24c9add0d24cb1be79 Author: Lisnichenko Dmitro AuthorDate: Mon Oct 19 20:01:01 2020 +0300 AMBARI-25571. Vulnerable Spring components in Ambari - CVE-2020-5398, CVE-2020-5421 (dlysnichenko) (#3246) --- ambari-infra/ambari-infra-manager/pom.xml| 4 ++-- ambari-logsearch/ambari-logsearch-server/pom.xml | 4 ++-- ambari-project/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ambari-infra/ambari-infra-manager/pom.xml b/ambari-infra/ambari-infra-manager/pom.xml index abf8571..8dac3b1 100644 --- a/ambari-infra/ambari-infra-manager/pom.xml +++ b/ambari-infra/ambari-infra-manager/pom.xml @@ -29,8 +29,8 @@ ambari-infra-manager -5.1.8.RELEASE -5.1.5.RELEASE +5.1.18.RELEASE +5.1.13.RELEASE 2.3.2.RELEASE 2.27 4.1.1.RELEASE diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index e265c3d..f8bc27a 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -26,8 +26,8 @@ jar Ambari Logsearch Server -5.1.8.RELEASE -5.1.5.RELEASE +5.1.18.RELEASE +5.1.13.RELEASE 3.0.10.RELEASE 2.0.10.RELEASE 2.1.5.RELEASE diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index e2010e3..d294876 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -38,8 +38,8 @@ 3.1.4 1.7.20 4.1.0 -5.1.8.RELEASE -5.1.5.RELEASE +5.1.18.RELEASE +5.1.13.RELEASE 2.10.0 2.10.0 42.2.2
[ambari] branch branch-2.7 updated: AMBARI-25565. ConfigHelper.java logging consumes most server logs for clusters with many hosts. (dvitiuk) (#3238)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 8ddc968 AMBARI-25565. ConfigHelper.java logging consumes most server
logs for clusters with many hosts. (dvitiuk) (#3238)
8ddc968 is described below
commit 8ddc968f56a96c72449e4f704fa6f1460b4cdce2
Author: dvitiiuk
AuthorDate: Wed Oct 7 18:26:52 2020 +0300
AMBARI-25565. ConfigHelper.java logging consumes most server logs for
clusters with many hosts. (dvitiuk) (#3238)
Co-authored-by: Dmytro Vitiuk
---
.../java/org/apache/ambari/server/state/ConfigHelper.java | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index c685c79..e7df496 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -2044,16 +2044,20 @@ public class ConfigHelper {
}
Map> configurations = new HashMap<>();
Map>> configurationAttributes =
new HashMap<>();
- if (LOG.isInfoEnabled()) {
-LOG.info("For configs update on host {} will be used cluster entity
{}", hostId, cl.getClusterEntity().toString());
+ if (LOG.isDebugEnabled()) {
+LOG.debug("For configs update on host {} will be used cluster entity
{}", hostId, cl.getClusterEntity().toString());
}
Map clusterDesiredConfigs =
cl.getDesiredConfigs(false);
- LOG.info("For configs update on host {} will be used following cluster
desired configs {}", hostId,
- clusterDesiredConfigs.toString());
+ if (LOG.isDebugEnabled()) {
+LOG.debug("For configs update on host {} will be used following
cluster desired configs {}", hostId,
+clusterDesiredConfigs.toString());
+ }
Map> configTags =
getEffectiveDesiredTags(cl, host.getHostName(),
clusterDesiredConfigs);
- LOG.info("For configs update on host {} will be used following effective
desired tags {}", hostId, configTags.toString());
+ if (LOG.isDebugEnabled()) {
+LOG.debug("For configs update on host {} will be used following
effective desired tags {}", hostId, configTags.toString());
+ }
getAndMergeHostConfigs(configurations, configTags, cl);
configurations = unescapeConfigNames(configurations);
[ambari] branch branch-2.7 updated: AMBARI-25511. hive auth fallback to SIMPLE because startup script fail to do kerberos login (dlysnichenko) (#3232)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 38323e0 AMBARI-25511. hive auth fallback to SIMPLE because startup
script fail to do kerberos login (dlysnichenko) (#3232)
38323e0 is described below
commit 38323e040cb165ee8e21c05631fbb677f3b62fc0
Author: Lisnichenko Dmitro
AuthorDate: Sat Sep 26 11:11:45 2020 +0300
AMBARI-25511. hive auth fallback to SIMPLE because startup script fail to
do kerberos login (dlysnichenko) (#3232)
---
.../src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json | 1 -
1 file changed, 1 deletion(-)
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
index 417f9bb..d4b9644 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
@@ -198,7 +198,6 @@
"name": "hive_server2_kerberized_env",
"description": "Hive server2 working on kerberized environment
(AMBARI-13749)",
"min_version": "2.2.3.0",
-"max_version": "2.2.5.0"
},
{
"name": "hive_env_heapsize",
[ambari] branch branch-2.7 updated: AMBARI-25551. NodeManager doesn't work after adding a new host to a patch upgraded cluster. (dvitiuk) (#3231)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 dc2da3f AMBARI-25551. NodeManager doesn't work after adding a new
host to a patch upgraded cluster. (dvitiuk) (#3231)
dc2da3f is described below
commit dc2da3f569e45c3d74f7d7ac5f31ad886e1bf700
Author: dvitiiuk
AuthorDate: Fri Sep 25 15:24:59 2020 +0300
AMBARI-25551. NodeManager doesn't work after adding a new host to a patch
upgraded cluster. (dvitiuk) (#3231)
Co-authored-by: Dmytro Vitiuk
---
.../ambari/server/upgrade/SchemaUpgradeHelper.java | 1 +
.../ambari/server/upgrade/UpgradeCatalog276.java | 145 +
2 files changed, 146 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 29fbdc2..feed420 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -194,6 +194,7 @@ public class SchemaUpgradeHelper {
catalogBinder.addBinding().to(UpgradeCatalog273.class);
catalogBinder.addBinding().to(UpgradeCatalog274.class);
catalogBinder.addBinding().to(UpgradeCatalog275.class);
+ catalogBinder.addBinding().to(UpgradeCatalog276.class);
catalogBinder.addBinding().to(UpdateAlertScriptPaths.class);
catalogBinder.addBinding().to(FinalUpgradeCatalog.class);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog276.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog276.java
new file mode 100644
index 000..578b69a
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog276.java
@@ -0,0 +1,145 @@
+/*
+ * 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.upgrade;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+
+
+/**
+ * The {@link UpgradeCatalog276} upgrades Ambari from 2.7.5 to 2.7.6.
+ */
+public class UpgradeCatalog276 extends AbstractUpgradeCatalog {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(UpgradeCatalog276.class);
+
+ @Inject
+ public UpgradeCatalog276(Injector injector) {
+super(injector);
+ }
+
+ @Override
+ public String getSourceVersion() {
+return "2.7.5";
+ }
+
+ @Override
+ public String getTargetVersion() {
+return "2.7.6";
+ }
+
+ /**
+ * Perform database schema transformation. Can work only before persist
service start
+ *
+ * @throws AmbariException
+ * @throws SQLException
+ */
+ @Override
+ protected void executeDDLUpdates() throws AmbariException, SQLException {
+// no actions needed
+ }
+
+ /**
+ * Perform data insertion before running normal upgrade of data, requires
started persist service
+ *
+ * @throws AmbariException
+ * @throws SQLException
+ */
+ @Override
+ protected void executePreDMLUpdates() throws AmbariException, SQLException {
+// no actions needed
+ }
+
+ /**
+ * Performs normal data upgrade
+ *
+ * @throws AmbariException
+ * @throws SQLException
+ */
+ @Override
+ protected void executeDMLUpdates() throws AmbariException, SQLException {
+LOG.debug("UpgradeCatalog276 executing DML Updates.");
+fixNativeLibrariesPathsForMR2AndTez();
+ }
+
+ protected void fixNativeLibrariesPathsForMR2AndTez() throws
[ambari] branch branch-2.7 updated: AMBARI-25552 Improve stack-trace disablement on HTTP 500 error response from the server (santal) (#3229)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 e3e613a AMBARI-25552 Improve stack-trace disablement on HTTP 500
error response from the server (santal) (#3229)
e3e613a is described below
commit e3e613a7f75f56bba37b3fb425249fbdffb28ac3
Author: Szilárd Antal
AuthorDate: Thu Sep 24 10:26:30 2020 +0200
AMBARI-25552 Improve stack-trace disablement on HTTP 500 error response
from the server (santal) (#3229)
* AMBARI-25552 Improve stack-trace disablement on HTTP 500 error response
from the server (santal)
Change-Id: Ifd57cfad94df4babb7e41fd9cb660e0ce3f2aba5
* extracting common code
Change-Id: Icc3277ddd7332491ad4b8156723df02445ee4c58
---
.../ambari/server/api/AmbariErrorHandler.java | 35 +
.../server/api/AmbariViewErrorHandlerProxy.java| 118
.../server/controller/AmbariHandlerList.java | 43 --
.../ambari/server/controller/AmbariServer.java | 6 +-
...rHandlerTest.java => AmbariErrorHandlerIT.java} | 15 +-
.../ambari/server/api/AmbariErrorHandlerTest.java | 151 +
.../api/AmbariViewErrorHandlerProxyTest.java | 117
.../server/controller/AmbariHandlerListTest.java | 2 +-
8 files changed, 410 insertions(+), 77 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java
index 9f69c60..b1bd658 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java
@@ -19,15 +19,20 @@
package org.apache.ambari.server.api;
import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.UUID;
+import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import
org.apache.ambari.server.security.authentication.jwt.JwtAuthenticationProperties;
import
org.apache.ambari.server.security.authentication.jwt.JwtAuthenticationPropertiesProvider;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.HttpChannel;
@@ -73,6 +78,23 @@ public class AmbariErrorHandler extends ErrorHandler {
}
errorMap.put("message", message);
+
+Throwable th = (Throwable)
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
+if (th != null) {
+ if (code == org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR) {
+UUID requestId = UUID.randomUUID();
+message = "Internal server error, please refer the exception by " +
requestId + " in the server log file";
+errorMap.put("message", message);
+LOG.error(message + ", requestURI: " + request.getRequestURI(), th);
+ }
+
+ if (this.isShowStacks()) {
+StringWriter writer = new StringWriter();
+writeErrorPageStacks(request, writer);
+errorMap.put("reason:", writer.toString());
+ }
+}
+
if ((code == HttpServletResponse.SC_FORBIDDEN) || (code ==
HttpServletResponse.SC_UNAUTHORIZED)) {
//if SSO is configured we should provide info about it in case of access
error
JwtAuthenticationProperties jwtProperties =
jwtAuthenticationPropertiesProvider.get();
@@ -92,4 +114,17 @@ public class AmbariErrorHandler extends ErrorHandler {
gson.toJson(errorMap, response.getWriter());
}
+
+ @Override
+ protected void writeErrorPageStacks(HttpServletRequest request, Writer
writer)
+throws IOException {
+Throwable th = (Throwable)
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
+
+while (th != null) {
+ writer.write("Caused by:\n");
+ write(writer, ExceptionUtils.getStackTrace(th));
+ writer.write("\n");
+ th = th.getCause();
+}
+ }
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java
new file mode 100644
index 000..e4d95d9
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java
@@ -0,0 +1,118 @@
+/*
+ * 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 li
[ambari] branch branch-2.7 updated: AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 3c99042 AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228) 3c99042 is described below commit 3c9904252ab0939cbe09e044ca127d1d2a791fe8 Author: Lisnichenko Dmitro AuthorDate: Mon Sep 21 21:28:24 2020 +0300 AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228) num_llap_nodes_for_llap_daemons properties (dlysnichenko) --- .../HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml | 4 ++-- .../HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1cb3c02..9c1e046 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 @@ -45,8 +45,8 @@ num_llap_nodes 1 -Number of nodes used by Hive's LLAP, which includes nodes running : LLAP daemon, Slider and Tez App Master(s). -Number of nodes used by Hive's LLAP +Number of nodes used by Hive's LLAP, which includes nodes running : LLAP daemon, Slider and Tez App Master(s). Depends on memory settings +Desired number of nodes used by Hive's LLAP int 1 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 8c75e30..1c233cb 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 @@ -65,8 +65,8 @@ num_llap_nodes_for_llap_daemons 1 -Number of Node(s) on which Hive LLAP daemon runs. -Number of Node(s) for running Hive LLAP daemon +Number of Node(s) on which Hive LLAP daemon runs. Defaults to num_llap_nodes, but may be overridden +Actual number of Node(s) for running Hive LLAP daemon int 1
[ambari] branch branch-2.7 updated: AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 3c99042 AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228) 3c99042 is described below commit 3c9904252ab0939cbe09e044ca127d1d2a791fe8 Author: Lisnichenko Dmitro AuthorDate: Mon Sep 21 21:28:24 2020 +0300 AMBARI-25559. Clarify the difference between num_llap_nodes and (#3228) num_llap_nodes_for_llap_daemons properties (dlysnichenko) --- .../HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml | 4 ++-- .../HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1cb3c02..9c1e046 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 @@ -45,8 +45,8 @@ num_llap_nodes 1 -Number of nodes used by Hive's LLAP, which includes nodes running : LLAP daemon, Slider and Tez App Master(s). -Number of nodes used by Hive's LLAP +Number of nodes used by Hive's LLAP, which includes nodes running : LLAP daemon, Slider and Tez App Master(s). Depends on memory settings +Desired number of nodes used by Hive's LLAP int 1 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 8c75e30..1c233cb 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 @@ -65,8 +65,8 @@ num_llap_nodes_for_llap_daemons 1 -Number of Node(s) on which Hive LLAP daemon runs. -Number of Node(s) for running Hive LLAP daemon +Number of Node(s) on which Hive LLAP daemon runs. Defaults to num_llap_nodes, but may be overridden +Actual number of Node(s) for running Hive LLAP daemon int 1
[ambari] branch branch-2.7 updated: AMBARI-25550. Add viewFS protocol to DFS_PROTOCOLS_REGEX (dlysnichenko) (#3226)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 7ead925 AMBARI-25550. Add viewFS protocol to DFS_PROTOCOLS_REGEX
(dlysnichenko) (#3226)
7ead925 is described below
commit 7ead9258e0b7dfe69f8ac862405aa85ad8aa162d
Author: Lisnichenko Dmitro
AuthorDate: Tue Sep 15 14:52:31 2020 +0300
AMBARI-25550. Add viewFS protocol to DFS_PROTOCOLS_REGEX (dlysnichenko)
(#3226)
---
.../checks/ServicesMapReduceDistributedCacheCheck.java | 2 +-
.../checks/ServicesTezDistributedCacheCheck.java | 2 +-
.../ServicesMapReduceDistributedCacheCheckTest.java| 18 ++
.../checks/ServicesTezDistributedCacheCheckTest.java | 18 ++
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
index 24f72a6..d8344b7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
@@ -47,7 +47,7 @@ public class ServicesMapReduceDistributedCacheCheck extends
AbstractCheckDescrip
static final String KEY_FRAMEWORK_PATH = "framework_path";
static final String KEY_NOT_DFS = "not_dfs";
static final String DFS_PROTOCOLS_REGEX_PROPERTY_NAME =
"dfs-protocols-regex";
- static final String DFS_PROTOCOLS_REGEX_DEFAULT =
"^([^:]*dfs|wasb|ecs|abfs):.*";
+ static final String DFS_PROTOCOLS_REGEX_DEFAULT =
"^([^:]*dfs|wasb|ecs|abfs|viewfs):.*";
/**
* {@inheritDoc}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
index 32d12bd..3da9e3e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
@@ -49,7 +49,7 @@ public class ServicesTezDistributedCacheCheck extends
AbstractCheckDescriptor {
static final String KEY_LIB_NOT_TARGZ = "lib_not_targz";
static final String KEY_USE_HADOOP_LIBS_FALSE = "tez_use_hadoop_libs_false";
static final String DFS_PROTOCOLS_REGEX_PROPERTY_NAME =
"dfs-protocols-regex";
- static final String DFS_PROTOCOLS_REGEX_DEFAULT =
"^([^:]*dfs|wasb|ecs|abfs):.*";
+ static final String DFS_PROTOCOLS_REGEX_DEFAULT =
"^([^:]*dfs|wasb|ecs|abfs|viewfs):.*";
/**
* {@inheritDoc}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
index b67d837..f48a1bf 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
@@ -238,6 +238,15 @@ public class ServicesMapReduceDistributedCacheCheckTest {
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
properties.put("fs.defaultFS", "anything");
+properties.put("mapreduce.application.framework.path",
"viewfs://some/path");
+properties.put("mapreduce.application.classpath", "anything");
+request = new PrereqCheckRequest("cluster");
+request.setPrerequisiteCheckConfig(prerequisiteCheckConfig);
+check = new PrerequisiteCheck(null, null);
+servicesMapReduceDistributedCacheCheck.perform(check, request);
+Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+
+properties.put("fs.defaultFS", "anything");
properties.put("mapreduce.application.framework.path", "ecs://some/path");
properties.put("mapreduce.application.classpath", "anything");
request = new PrereqCheckRequest("cluster");
@@ -282,6 +291,15 @@ public class ServicesMapReduceDistributedCacheCheckTest {
servicesMapReduceDistributedCacheCheck.perform(check, request);
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+properties.put("fs.defaultFS", "viewfs://ha");
+properties.put("mapreduce.application.framework.path", "/some/path");
+properties.put("mapreduce.application.classpath", &qu
[ambari] branch branch-2.7 updated: replace maven repo urls with their https counterparts (dlysnichenko) (#3170)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 ec9bb74 replace maven repo urls with their https counterparts
(dlysnichenko) (#3170)
ec9bb74 is described below
commit ec9bb74e3998e3ccc1b0a8c7fc85ef82cdfec4bb
Author: Lisnichenko Dmitro
AuthorDate: Wed Jan 22 17:49:11 2020 +0200
replace maven repo urls with their https counterparts (dlysnichenko) (#3170)
---
.../ZEPPELIN/0.6.0/package/scripts/interpreter_json_template.py | 2 +-
.../ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py | 2 +-
.../test/python/stacks/2.5/ZEPPELIN/interpreter_json_generated.py | 8
.../test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py | 8
contrib/fast-hdfs-resource/dependency-reduced-pom.xml | 2 +-
contrib/utils/perf/deploy-gce-perf-cluster.py | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/interpreter_json_template.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/interpreter_json_template.py
index 6a98919..f0eb406 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/interpreter_json_template.py
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/interpreter_json_template.py
@@ -325,7 +325,7 @@ template = '''
{
"id": "central",
"type": "default",
- "url": "http://repo1.maven.org/maven2/;,
+ "url": "https://repo1.maven.org/maven2/;,
"releasePolicy": {
"enabled": true,
"updatePolicy": "daily",
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
index b373e22..0546144 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
@@ -482,7 +482,7 @@ template = '''
{
"id": "central",
"type": "default",
- "url": "http://repo1.maven.org/maven2/;,
+ "url": "https://repo1.maven.org/maven2/;,
"releasePolicy": {
"enabled": true,
"updatePolicy": "daily",
diff --git
a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/interpreter_json_generated.py
b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/interpreter_json_generated.py
index f1d70ad..fabb896 100644
---
a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/interpreter_json_generated.py
+++
b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/interpreter_json_generated.py
@@ -18,10 +18,10 @@ limitations under the License.
"""
-template = '\n{\n "interpreterSettings": {\n"2CKEKWY8Z": {\n "id":
"2CKEKWY8Z",\n "name": "angular",\n "group": "angular",\n
"properties": {},\n "status": "READY",\n "interpreterGroup": [\n
{\n "name": "angular",\n "class":
"org.apache.zeppelin.angular.AngularInterpreter",\n
"defaultInterpreter": false,\n "editor": {\n
"editOnDblClick": true\n }\n}\n ],\n "dependencies":
[] [...]
+template = '\n{\n "interpreterSettings": {\n"2CKEKWY8Z": {\n "id":
"2CKEKWY8Z",\n "name": "angular",\n "group": "angular",\n
"properties": {},\n "status": "READY",\n "interpreterGroup": [\n
{\n "name": "angular",\n "class":
"org.apache.zeppelin.angular.AngularInterpreter",\n
"defaultInterpreter": false,\n "editor": {\n
"editOnDblClick": true\n }\n}\n ],\n "dependencies":
[] [...]
-template_after_base = '{\n "interpreterSettings": {\n"2CHS8UYQQ": {\n
"status": "READY", \n "group": "sh", \n "name": "sh", \n "id":
"2CHS8U
[ambari] branch branch-2.7 updated: AMBARI-25408 Upgrade Infra Solr to 7.7.2 (santal) (#3116)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 f12382c AMBARI-25408 Upgrade Infra Solr to 7.7.2 (santal) (#3116) f12382c is described below commit f12382c11c09d4e1acef42033c50fa197eab2754 Author: Szilárd Antal AuthorDate: Thu Oct 31 11:02:58 2019 +0100 AMBARI-25408 Upgrade Infra Solr to 7.7.2 (santal) (#3116) --- ambari-infra/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml index c13d24e..b3b7e9f 100644 --- a/ambari-infra/pom.xml +++ b/ambari-infra/pom.xml @@ -25,7 +25,7 @@ 1.8 -7.7.0 +7.7.2 UTF-8 python = 2.6 python (= 2.6)
[ambari] branch branch-2.7 updated: AMBARI-25394 Ambari Metrics whitelisting is failing on * wildcard for HBase Tables (santal) (#3104)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 fd305e7 AMBARI-25394 Ambari Metrics whitelisting is failing on * wildcard for HBase Tables (santal) (#3104) fd305e7 is described below commit fd305e7de5a18002102e7cec8c717289b33bb1fe Author: Szilárd Antal AuthorDate: Tue Oct 22 10:47:24 2019 +0200 AMBARI-25394 Ambari Metrics whitelisting is failing on * wildcard for HBase Tables (santal) (#3104) --- .../conf/unix/metrics_whitelist| 70 +++--- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist index f183034..8fcb485 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist +++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist @@ -463,41 +463,41 @@ regionserver.Server.storeFileSize regionserver.Server.totalRequestCount regionserver.Server.updatesBlockedTime regionserver.Server.writeRequestCount -regionserver.Tables.*_metric_averageRegionSize -regionserver.Tables.*_metric_avgStoreFileAge -regionserver.Tables.*_metric_flushMemstoreSize_95th_percentile -regionserver.Tables.*_metric_flushMemstoreSize_max -regionserver.Tables.*_metric_flushMemstoreSize_mean -regionserver.Tables.*_metric_flushMemstoreSize_median -regionserver.Tables.*_metric_flushOutputSize_95th_percentile -regionserver.Tables.*_metric_flushOutputSize_max -regionserver.Tables.*_metric_flushOutputSize_mean -regionserver.Tables.*_metric_flushOutputSize_median -regionserver.Tables.*_metric_flushTime_95th_percentile -regionserver.Tables.*_metric_flushTime_max -regionserver.Tables.*_metric_flushTime_mean -regionserver.Tables.*_metric_flushTime_median -regionserver.Tables.*_metric_flushTime_num_ops -regionserver.Tables.*_metric_flushedMemstoreBytes -regionserver.Tables.*_metric_flushedOutputBytes -regionserver.Tables.*_metric_maxStoreFileAge -regionserver.Tables.*_metric_memStoreSize -regionserver.Tables.*_metric_minStoreFileAge -regionserver.Tables.*_metric_numReferenceFiles -regionserver.Tables.*_metric_readRequestCount -regionserver.Tables.*_metric_regionCount -regionserver.Tables.*_metric_storeCount -regionserver.Tables.*_metric_storeFileCount -regionserver.Tables.*_metric_storeFileSize -regionserver.Tables.*_metric_tableSize -regionserver.Tables.*_metric_totalRequestCount -regionserver.Tables.*_metric_writeRequestCount -regionserver.Users.*_metric_append_num_ops -regionserver.Users.*_metric_delete_num_ops -regionserver.Users.*_metric_get_num_ops -regionserver.Users.*_metric_increment_num_ops -regionserver.Users.*_metric_mutate_num_ops -regionserver.Users.*_metric_scanTime_num_ops +._p_regionserver.Tables.*_metric_averageRegionSize +._p_regionserver.Tables.*_metric_avgStoreFileAge +._p_regionserver.Tables.*_metric_flushMemstoreSize_95th_percentile +._p_regionserver.Tables.*_metric_flushMemstoreSize_max +._p_regionserver.Tables.*_metric_flushMemstoreSize_mean +._p_regionserver.Tables.*_metric_flushMemstoreSize_median +._p_regionserver.Tables.*_metric_flushOutputSize_95th_percentile +._p_regionserver.Tables.*_metric_flushOutputSize_max +._p_regionserver.Tables.*_metric_flushOutputSize_mean +._p_regionserver.Tables.*_metric_flushOutputSize_median +._p_regionserver.Tables.*_metric_flushTime_95th_percentile +._p_regionserver.Tables.*_metric_flushTime_max +._p_regionserver.Tables.*_metric_flushTime_mean +._p_regionserver.Tables.*_metric_flushTime_median +._p_regionserver.Tables.*_metric_flushTime_num_ops +._p_regionserver.Tables.*_metric_flushedMemstoreBytes +._p_regionserver.Tables.*_metric_flushedOutputBytes +._p_regionserver.Tables.*_metric_maxStoreFileAge +._p_regionserver.Tables.*_metric_memStoreSize +._p_regionserver.Tables.*_metric_minStoreFileAge +._p_regionserver.Tables.*_metric_numReferenceFiles +._p_regionserver.Tables.*_metric_readRequestCount +._p_regionserver.Tables.*_metric_regionCount +._p_regionserver.Tables.*_metric_storeCount +._p_regionserver.Tables.*_metric_storeFileCount +._p_regionserver.Tables.*_metric_storeFileSize +._p_regionserver.Tables.*_metric_tableSize +._p_regionserver.Tables.*_metric_totalRequestCount +._p_regionserver.Tables.*_metric_writeRequestCount +._p_regionserver.Users.*_metric_append_num_ops +._p_regionserver.Users.*_metric_delete_num_ops +._p_regionserver.Users.*_metric_get_num_ops +._p_regionserver.Users.*_metric_increment_num_ops +._p_regionserver.Users.*_metric_mutate_num_ops +._p_regionserver.Users.*_metric_scanTime_num_ops regionserver.WAL.AppendSize_75th_percentile regionserver.WAL.AppendSize_95th_percentile regionserver.WAL.AppendSize_99th_percentile
[ambari] branch branch-2.7 updated: AMBARI-25370 Producer and Customer Request /s graphs are failing on Kafa Grafana dashboards (#3080)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 7405c68 AMBARI-25370 Producer and Customer Request /s graphs are
failing on Kafa Grafana dashboards (#3080)
7405c68 is described below
commit 7405c68f5daca31353455722cf78724fca584fd8
Author: payert <35402259+pay...@users.noreply.github.com>
AuthorDate: Fri Sep 6 11:41:13 2019 +0200
AMBARI-25370 Producer and Customer Request /s graphs are failing on Kafa
Grafana dashboards (#3080)
From kafka 2.0.0 there has been addition of version tag in
kafka.network.RequestMetrics.RequestsPerSec.request.* metrics.
This is breaking the the default Grafana dashboard provided by Ambari. On
the Kafka - Home and Kafka - Hosts dashboards
the Producer requests /s and Consumer requests /s graphs are failing to
show any data.
Change-Id: I08656a6f43923b08b3bbc1f1e0346bd93211bbe8
---
.../ambari-metrics/datasource.js | 31 +-
.../conf/unix/metrics_whitelist| 2 ++
.../conf/windows/metrics_whitelist | 2 ++
.../grafana-dashboards/HDP/grafana-kafka-home.json | 12 +
.../HDP/grafana-kafka-hosts.json | 12 +
5 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index ec5ee10..b838ad5 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -99,7 +99,7 @@ define([
if(!_.isEmpty(templateSrv.variables) &&
templateSrv.variables[0].query === "yarnqueues") {
alias = alias + ' on ' + target.qmetric; }
if(!_.isEmpty(templateSrv.variables) &&
templateSrv.variables[0].query === "kafka-topics") {
-alias = alias + ' on ' + target.kbTopic; }
+ alias = alias + ' on ' + target.kbTopic; }
return function (res) {
res = res.data;
console.log('processing metric ' + target.metric);
@@ -595,12 +595,29 @@ define([
if (indexOfHosts >= 0) {
var allHosts = templateSrv._values.hosts.lastIndexOf('}') > 0 ?
templateSrv._values.hosts.slice(1,-1) :
templateSrv._values.hosts;
- allHosts = templateSrv._texts.hosts === "All" ? '%' : allHosts;
- metricsPromises.push(_.map(options.targets, function(target) {
- target.templatedHost = allHosts? allHosts : '';
- target.templatedCluster = templatedCluster;
- return getAllHostData(target);
- }));
+
+ /* The Producer & Comsumer Requests graphs on the Kafka Hosts
dashboard should display metrics that are
+ * versioned, thus the value of different versions should be
aggregated and grouped by hosts.
+ * In order to have a 'grouped by hosts' like view the metric
results are queried for each hosts separately.
+ */
+ if (!_.isEmpty(options.targets.filter(function(target) {
+return target.metric.endsWith(".%.count"); }))) {
+allHosts = allHosts.split(',');
+_.forEach(allHosts, function(host) {
+metricsPromises.push(_.map(options.targets,
function(target) {
+target.templatedHost = host;
+target.templatedCluster = templatedCluster;
+return getAllHostData(target);
+}));
+});
+ } else {
+ allHosts = templateSrv._texts.hosts === "All" ? '%' :
allHosts;
+ metricsPromises.push(_.map(options.targets, function(target)
{
+ target.templatedHost = allHosts? allHosts : '';
+ target.templatedCluster = templatedCluster;
+ return getAllHostData(target);
+}));
+ }
}
metricsPromises = _.flatten(metricsPromises);
} else {
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
index fd03d6e..689fd0d 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
@@ -273,6 +273,8 @@ kafka.controller.KafkaController.OfflinePartitionsCount
kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate
kafka.network.RequestMetrics.RequestsPerSec.request.Fetc
[ambari] branch branch-2.7 updated: AMBARI-25343. Storm Service Check fails during Rolling Upgrade due to… (#3058)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 6fd7ce1 AMBARI-25343. Storm Service Check fails during Rolling
Upgrade due to… (#3058)
6fd7ce1 is described below
commit 6fd7ce1a7e580b604b0c6e486e181bf2374b2ac1
Author: Lisnichenko Dmitro
AuthorDate: Thu Jul 25 19:10:18 2019 +0300
AMBARI-25343. Storm Service Check fails during Rolling Upgrade due to…
(#3058)
* AMBARI-25343. Storm Service Check fails during Rolling Upgrade due to
Nimbus leader selection (dlysnichenko)
* AMBARI-25343. Storm Service Check fails during Rolling Upgrade due to
Nimbus leader selection - fix import (dlysnichenko)
---
.../STORM/0.9.1/package/scripts/service_check.py | 12 +---
.../src/test/python/stacks/2.1/STORM/test_service_check.py | 2 ++
.../src/test/python/stacks/2.3/STORM/test_service_check.py | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/service_check.py
index 52f73ed..8d49208 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/service_check.py
@@ -75,16 +75,22 @@ class ServiceCheckDefault(ServiceCheck):
storm_client_jaas_file = format("{conf_dir}/client_jaas.conf")
cmd = format("{kinit_cmd}{cmd} -c
java.security.auth.login.config={storm_client_jaas_file}")
+try_count = 1
+if params.nimbus_hosts and len(params.nimbus_hosts) > 1:
+ try_count = 3
+ print("Nimbus HA is enabled. The check may be retried up to %d times in
order to wait for the Nimbus leader selection" % try_count)
Execute(cmd,
logoutput=True,
path=params.storm_bin_dir,
-user=params.storm_user
-)
+user=params.storm_user,
+try_sleep=30,
+tries=try_count
+)
Execute(format("storm kill WordCount{unique}"),
path=params.storm_bin_dir,
user=params.storm_user
-)
+)
if __name__ == "__main__":
ServiceCheck().execute()
diff --git
a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
index 799494b..a7708ca 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
@@ -44,6 +44,8 @@ class TestStormServiceCheck(TestStormBase):
self.assertResourceCalled('Execute', 'storm jar /tmp/wordCount.jar
storm.starter.WordCountTopology WordCount -c
nimbus.host=c6402.ambari.apache.org',
logoutput = True,
path = ['/usr/bin'],
+ tries = 1,
+ try_sleep = 30,
user = 'storm'
)
self.assertResourceCalled('Execute', 'storm kill WordCount',
diff --git
a/ambari-server/src/test/python/stacks/2.3/STORM/test_service_check.py
b/ambari-server/src/test/python/stacks/2.3/STORM/test_service_check.py
index 47101d2..a29783b 100644
--- a/ambari-server/src/test/python/stacks/2.3/STORM/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.3/STORM/test_service_check.py
@@ -43,6 +43,8 @@ class TestStormServiceCheck(TestStormBase):
self.assertResourceCalled('Execute', 'storm jar /tmp/wordCount.jar
storm.starter.WordCountTopology WordCount',
logoutput = True,
path = ['/usr/hdp/current/storm-client/bin'],
+ tries = 3,
+ try_sleep = 30,
user = 'storm'
)
self.assertResourceCalled('Execute', 'storm kill WordCount',
[ambari] branch trunk updated: [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (#3035)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 9cae3c4 [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (#3035) 9cae3c4 is described below commit 9cae3c4f5a5884956630f128cef786d15ccb9610 Author: Viraj Jasani AuthorDate: Tue Jun 25 16:57:04 2019 +0530 [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (#3035) --- ambari-project/pom.xml | 2 +- ambari-server/pom.xml| 2 +- ambari-serviceadvisor/pom.xml| 4 ++-- contrib/ambari-log4j/pom.xml | 2 +- contrib/views/capacity-scheduler/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 5bc4497..dd8b904 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -418,7 +418,7 @@ commons-lang commons-lang -2.5 +2.6 javax.servlet diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index ab7cd11..bbe38e6 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1335,7 +1335,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-net diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml index 664328f..d05740f 100644 --- a/ambari-serviceadvisor/pom.xml +++ b/ambari-serviceadvisor/pom.xml @@ -47,13 +47,13 @@ org.apache.commons commons-lang3 - 3.0 + 3.9 commons-lang commons-lang - 2.4 + 2.6 diff --git a/contrib/ambari-log4j/pom.xml b/contrib/ambari-log4j/pom.xml index 94a1312..fdb1663 100644 --- a/contrib/ambari-log4j/pom.xml +++ b/contrib/ambari-log4j/pom.xml @@ -86,7 +86,7 @@ commons-lang commons-lang - 2.4 + 2.6 postgresql diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml index cc99f28..b2855e1 100644 --- a/contrib/views/capacity-scheduler/pom.xml +++ b/contrib/views/capacity-scheduler/pom.xml @@ -60,7 +60,7 @@ commons-lang commons-lang -2.2 +2.6 com.googlecode.json-simple
[ambari] branch branch-2.7 updated: [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (branch-2.7) (#3031)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 54dc60b [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (branch-2.7) (#3031) 54dc60b is described below commit 54dc60b773d0e782ecf6aba91079fd8855827159 Author: Viraj Jasani AuthorDate: Tue Jun 25 16:51:13 2019 +0530 [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions (branch-2.7) (#3031) * [AMBARI-25324] : Upgrade commons-lang/lang3 to latest versions * minor changes - revert lang3 version for ambari-metrics --- ambari-infra/pom.xml | 2 +- ambari-logsearch/ambari-logsearch-config-json/pom.xml | 2 +- ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 2 +- ambari-logsearch/ambari-logsearch-server/pom.xml | 2 +- ambari-metrics/ambari-metrics-common/pom.xml | 2 +- ambari-metrics/ambari-metrics-timelineservice/pom.xml | 2 +- ambari-project/pom.xml| 2 +- ambari-server/pom.xml | 2 +- ambari-serviceadvisor/pom.xml | 4 ++-- contrib/ambari-log4j/pom.xml | 2 +- contrib/views/capacity-scheduler/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml index 602cdc6..b95ae4e 100644 --- a/ambari-infra/pom.xml +++ b/ambari-infra/pom.xml @@ -318,7 +318,7 @@ commons-lang commons-lang -2.5 +2.6 commons-fileupload diff --git a/ambari-logsearch/ambari-logsearch-config-json/pom.xml b/ambari-logsearch/ambari-logsearch-config-json/pom.xml index f38fefd..6226313 100644 --- a/ambari-logsearch/ambari-logsearch-config-json/pom.xml +++ b/ambari-logsearch/ambari-logsearch-config-json/pom.xml @@ -42,7 +42,7 @@ org.apache.commons commons-lang3 - 3.4 + 3.9 commons-collections diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index 73d91d2..64331c9 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -230,7 +230,7 @@ org.apache.commons commons-lang3 - 3.6 + 3.9 org.springframework.boot diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index c92bd46..3abe582 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -476,7 +476,7 @@ commons-lang commons-lang - 2.5 + 2.6 cglib diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml index a309e5d..c08ff4c 100644 --- a/ambari-metrics/ambari-metrics-common/pom.xml +++ b/ambari-metrics/ambari-metrics-common/pom.xml @@ -185,7 +185,7 @@ commons-lang commons-lang - 2.5 + 2.6 org.apache.commons diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index e4f6532..6ebbf44 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -375,7 +375,7 @@ commons-lang commons-lang - 2.5 + 2.6 diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 32f173f..9926d08 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -357,7 +357,7 @@ commons-lang commons-lang -2.5 +2.6 javax.servlet diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 4a036f3..401836a 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1347,7 +1347,7 @@ org.apache.commons commons-lang3 - 3.1 + 3.9 commons-net diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml index e351c65..67b85ab 100644 --- a/ambari-serviceadvisor/pom.xml +++ b/ambari-serviceadvisor/pom.xml @@ -47,13 +47,13 @@ org.apache.commons commons-lang3 - 3.0 + 3.9 commons-lang commons-lang - 2.4 + 2.6 diff --git a/contrib/ambari-log4j/pom.xml b/contrib/ambari-log4j/pom.xml index b98ef15..2cd9523 100644 --- a/contrib/ambari-log4j/pom.xml +++ b/contrib/ambari-log4j/pom.xml @@ -85,7 +85,7 @@ commons-lang commons-lang - 2.4 + 2.6 postgresql diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml index 4bf118d
[ambari] branch branch-2.7 updated: AMBARI-25268. implement configurable password policy for Ambari users - additional improvements (dlysnichenko) (#3034)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 a9b6703 AMBARI-25268. implement configurable password policy for
Ambari users - additional improvements (dlysnichenko) (#3034)
a9b6703 is described below
commit a9b6703f484715e0a7fac8cb0fb997e25f54b9bf
Author: Lisnichenko Dmitro
AuthorDate: Tue Jun 25 14:17:46 2019 +0300
AMBARI-25268. implement configurable password policy for Ambari users -
additional improvements (dlysnichenko) (#3034)
---
.../ambari/server/configuration/Configuration.java | 27 ++
.../ambari/server/controller/AmbariServer.java | 1 +
.../server/security/authorization/Users.java | 2 +-
.../server/security/authorization/TestUsers.java | 3 ++-
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index c4f7c08..1541bb2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -50,6 +50,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
import org.apache.ambari.annotations.Experimental;
import org.apache.ambari.annotations.ExperimentalFeature;
@@ -514,6 +515,14 @@ public class Configuration {
"security.password.policy.regexp", ".*");
/**
+ * Configurable password policy for Ambari users
+ */
+ @Markdown(
+ description = "Password policy description that is shown to users")
+ public static final ConfigurationProperty
PASSWORD_POLICY_DESCRIPTION = new ConfigurationProperty<>(
+ "security.password.policy.description", "");
+
+ /**
* Determines whether the Ambari Agent host names should be validated against
* a regular expression to ensure that they are well-formed.
*/
@@ -2634,6 +2643,17 @@ public class Configuration {
}
/**
+ * Validate password policy regexp syntax
+ * @throws java.util.regex.PatternSyntaxException If the expression's syntax
is invalid
+ */
+ public void validatePasswordPolicyRegexp() {
+String regexp = getPasswordPolicyRegexp();
+if (!StringUtils.isEmpty(regexp) && !regexp.equalsIgnoreCase(".*")) {
+ Pattern.compile(regexp);
+}
+ }
+
+ /**
* Ldap username collision handling behavior.
* ADD - append the new LDAP entry to the set of existing authentication
methods.
* CONVERT - remove all authentication methods except for the new LDAP entry.
@@ -4017,6 +4037,13 @@ public class Configuration {
return getProperty(PASSWORD_POLICY_REGEXP);
}
+ /**
+ * @return Password policy explanation according to regexp
+ */
+ public String getPasswordPolicyDescription() {
+return getProperty(PASSWORD_POLICY_DESCRIPTION);
+ }
+
public JPATableGenerationStrategy getJPATableGenerationStrategy() {
return JPATableGenerationStrategy.fromString(
System.getProperty(SERVER_JDBC_GENERATE_TABLES.getKey()));
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index b97e984..bd99527 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -1088,6 +1088,7 @@ public class AmbariServer {
// check if this instance is the active instance
Configuration config = injector.getInstance(Configuration.class);
+ config.validatePasswordPolicyRegexp();
if (!config.isActiveInstance()) {
String errMsg = "This instance of ambari server is not designated as
active. Cannot start ambari server." +
"The property active.instance is set to false in
ambari.properties";
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
index 3f81c52..13f7a92 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
@@ -1760,7 +1760,7 @@ public class Users {
}
String regexp = configuration.getPasswordPolicyRegexp();
if (!StringUtils.isEmpty(regexp) && (!Pattern.matches(regex
[ambari] branch branch-2.7 updated: AMBARI-25312. Ambari 2.7.4 is missing upgrade catalogs (dlysnichenko) (#3018)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 302fa8a AMBARI-25312. Ambari 2.7.4 is missing upgrade catalogs
(dlysnichenko) (#3018)
302fa8a is described below
commit 302fa8a62e9d5e289f2bcbc9ef71cc27ae852a9e
Author: Lisnichenko Dmitro
AuthorDate: Thu Jun 20 12:18:46 2019 +0300
AMBARI-25312. Ambari 2.7.4 is missing upgrade catalogs (dlysnichenko)
(#3018)
* AMBARI-25312. Ambari 2.7.4 is missing upgrade catalogs (dlysnichenko)
* AMBARI-25312. Ambari 2.7.4 is missing upgrade catalogs (dlysnichenko)
---
.../ambari/server/upgrade/SchemaUpgradeHelper.java | 1 +
.../ambari/server/upgrade/UpgradeCatalog273.java | 66 ++
.../ambari/server/upgrade/UpgradeCatalog274.java | 6 +-
3 files changed, 70 insertions(+), 3 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 8896302..4fa8030 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -191,6 +191,7 @@ public class SchemaUpgradeHelper {
catalogBinder.addBinding().to(UpgradeCatalog270.class);
catalogBinder.addBinding().to(UpgradeCatalog271.class);
catalogBinder.addBinding().to(UpgradeCatalog272.class);
+ catalogBinder.addBinding().to(UpgradeCatalog273.class);
catalogBinder.addBinding().to(UpgradeCatalog274.class);
catalogBinder.addBinding().to(UpdateAlertScriptPaths.class);
catalogBinder.addBinding().to(FinalUpgradeCatalog.class);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog273.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog273.java
new file mode 100644
index 000..2fba336
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog273.java
@@ -0,0 +1,66 @@
+/*
+ * 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.upgrade;
+
+import java.sql.SQLException;
+
+import org.apache.ambari.server.AmbariException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+
+/**
+ * The {@link UpgradeCatalog273} upgrades Ambari from 2.7.2 to 2.7.3.
+ */
+public class UpgradeCatalog273 extends AbstractUpgradeCatalog {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(UpgradeCatalog273.class);
+
+ @Inject
+ public UpgradeCatalog273(Injector injector) {
+super(injector);
+ }
+
+ @Override
+ public String getSourceVersion() {
+return "2.7.2";
+ }
+
+ @Override
+ public String getTargetVersion() {
+return "2.7.3";
+ }
+
+ @Override
+ protected void executeDDLUpdates() throws AmbariException, SQLException {
+// nothing to do
+ }
+
+ @Override
+ protected void executePreDMLUpdates() throws AmbariException, SQLException {
+// nothing to do
+ }
+
+ @Override
+ protected void executeDMLUpdates() throws AmbariException, SQLException {
+addNewConfigurationsFromXml();
+ }
+
+}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog274.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog274.java
index b85b88a..458beeb 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog274.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog274.java
@@ -31,7 +31,7 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
/**
- * The {@link UpgradeCatalog274} upgrades Ambari from 2.7.2 to 2.7.4.
+ * The {@link UpgradeCatalog274} upgrades Ambari from 2.7.3 to 2.7.4.
*/
public class UpgradeCatalog274 extends AbstractUpgradeCatalog {
@@ -48,7 +48,7 @@ public class UpgradeC
[ambari] branch branch-2.7 updated: AMBARI-25300. Improper Error Handling when user creates a duplicate alert (dlysnichenko) (#3005)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 a2514a5 AMBARI-25300. Improper Error Handling when user creates a
duplicate alert (dlysnichenko) (#3005)
a2514a5 is described below
commit a2514a5bac549f0d853f03b5eac6a5a4ae185cb9
Author: Lisnichenko Dmitro
AuthorDate: Tue Jun 11 16:05:41 2019 +0300
AMBARI-25300. Improper Error Handling when user creates a duplicate alert
(dlysnichenko) (#3005)
---
.../internal/AlertTargetResourceProvider.java | 10 ++--
.../internal/AlertTargetResourceProviderTest.java | 64 ++
2 files changed, 70 insertions(+), 4 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
index dc0fd57..6489ecf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
@@ -335,13 +335,15 @@ public class AlertTargetResourceProvider extends
}
// if we are overwriting an existing, determine if one exists first
- AlertTargetEntity entity = null;
- if( overwriteExisting ) {
-entity = s_dao.findTargetByName(name);
- }
+ AlertTargetEntity entity = s_dao.findTargetByName(name);
if (null == entity) {
entity = new AlertTargetEntity();
+ } else {
+if( !overwriteExisting ) {
+ throw new IllegalArgumentException(
+ "Alert targets already exists and can't be created");
+}
}
// groups are not required on creation
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
index efedd2b..c921806 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
@@ -294,6 +294,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testCreateResources(Authentication authentication) throws
Exception {
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
Capture targetCapture = newCapture();
m_dao.create(capture(targetCapture));
expectLastCall();
@@ -364,6 +365,7 @@ public class AlertTargetResourceProviderTest {
group2.setGroupId(2L);
group3.setGroupId(3L);
groups.addAll(Arrays.asList(group1, group2, group3));
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
expect(m_dao.findGroupsById(groupIds)).andReturn(groups).once();
Capture targetCapture = EasyMock.newCapture();
@@ -431,6 +433,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testCreateGlobalTarget(Authentication authentication) throws
Exception {
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
Capture targetCapture = EasyMock.newCapture();
m_dao.create(capture(targetCapture));
expectLastCall();
@@ -497,6 +500,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testCreateResourceWithRecipientArray(Authentication
authentication) throws Exception {
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
Capture targetCapture = EasyMock.newCapture();
m_dao.create(capture(targetCapture));
expectLastCall();
@@ -561,6 +565,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testCreateResourceWithAlertStates(Authentication
authentication) throws Exception {
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
Capture targetCapture = EasyMock.newCapture();
m_dao.create(capture(targetCapture));
expectLastCall();
@@ -628,6 +633,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testUpdateResources(Authentication authentication) throws
Exception {
+
expect(m_dao.findTargetByName(ALERT_TARGET_NAME)).andReturn(null).atLeastOnce();
Capture entityCapture = EasyMock.newCapture();
m_dao.create(capture(entityCapture));
expectLastCall().times(1);
@@ -703,6 +709,7 @@ public class AlertTargetResourceProviderTest {
* @throws Exception
*/
private void testUpdateResources
[ambari] branch branch-2.7 updated: AMBARI-25295. Ambari Server Error on submitting EU (dlysnichenko) (#3001)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 41a9c6f AMBARI-25295. Ambari Server Error on submitting EU
(dlysnichenko) (#3001)
41a9c6f is described below
commit 41a9c6fa1771327062aa6425209e6ee863f18730
Author: Lisnichenko Dmitro
AuthorDate: Thu Jun 6 18:14:01 2019 +0300
AMBARI-25295. Ambari Server Error on submitting EU (dlysnichenko) (#3001)
---
.../kerberos/IPAKerberosOperationHandler.java | 9 +++--
.../kerberos/MITKerberosOperationHandler.java | 12 ++--
.../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 15 +++
.../KERBEROS/1.10.3-30/configuration/kerberos-env.xml | 15 +++
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
index 07ab77e..d9732e9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.serveraction.kerberos;
+import java.util.Arrays;
import java.util.Map;
import java.util.Set;
@@ -254,13 +255,17 @@ public class IPAKerberosOperationHandler extends
KDCKerberosOperationHandler {
}
@Override
- protected String[] getKinitCommand(String executableKinit,
PrincipalKeyCredential credentials, String credentialsCache, Map kerberosConfiguration) {
-return new String[]{
+ protected String[] getKinitCommand(String executableKinit,
PrincipalKeyCredential credentials, String credentialsCache, Map kerberosConfiguration) throws KerberosOperationException {
+String [] command = new String[]{
executableKinit,
"-c",
credentialsCache,
credentials.getPrincipal()
};
+if (Arrays.asList(command).contains(null)){
+ throw new KerberosOperationException("Got a null value, can not create
'kinit' command");
+}
+return command;
}
@Override
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
index 142aace..914914e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.serveraction.kerberos;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -342,8 +343,11 @@ public class MITKerberosOperationHandler extends
KDCKerberosOperationHandler {
protected String[] getKinitCommand(String executableKinit,
PrincipalKeyCredential credentials, String credentialsCache, Map kerberosConfiguration) throws KerberosOperationException {
// kinit -c -S kadmin/`hostname -f`
try {
- final String kadminPrincipalName =
variableReplacementHelper.replaceVariables(kerberosConfiguration.get(KERBEROS_ENV_KADMIN_PRINCIPAL_NAME),
buildReplacementsMap(kerberosConfiguration));
- return new String[]{
+ String kadminPrincipalName =
variableReplacementHelper.replaceVariables(kerberosConfiguration.get(KERBEROS_ENV_KADMIN_PRINCIPAL_NAME),
buildReplacementsMap(kerberosConfiguration));
+ if (kadminPrincipalName == null) {
+kadminPrincipalName = String.format("kadmin/%s",
getAdminServerHost(false));
+ }
+ String [] command = new String[]{
executableKinit,
"-c",
credentialsCache,
@@ -351,6 +355,10 @@ public class MITKerberosOperationHandler extends
KDCKerberosOperationHandler {
kadminPrincipalName,
credentials.getPrincipal()
};
+ if (Arrays.asList(command).contains(null)){
+throw new KerberosOperationException("Got a null value, can not create
'kinit' command");
+ }
+ return command;
} catch (AmbariException e) {
throw new KerberosOperationException("Error while getting 'kinit'
command", e);
}
diff --git
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 63afab6..d00e597 100644
---
a/ambari-server/src/main/resources/common-services/KERBEROS/1
[ambari] branch branch-2.7 updated: AMBARI-25290. Custom timeout ignored, python script has been killed d… (#2992)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 fb64138 AMBARI-25290. Custom timeout ignored, python script has been
killed d… (#2992)
fb64138 is described below
commit fb64138a7159a837aec846777a33169109fba9cf
Author: Lisnichenko Dmitro
AuthorDate: Thu May 30 23:05:18 2019 +0300
AMBARI-25290. Custom timeout ignored, python script has been killed d…
(#2992)
* AMBARI-25290. Custom timeout ignored, python script has been killed due
to timeout after waiting 2700 secs during HDP upgrade (dlysnichenko)
* AMBARI-25290. Custom timeout ignored, python script has been killed due
to timeout after waiting 2700 secs during HDP upgrade - address review comment
(dlysnichenko)
---
.../server/controller/ActionExecutionContext.java| 8
.../AmbariCustomCommandExecutionHelper.java | 2 +-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/HostStackVersionResourceProvider.java | 4 ++--
.../controller/internal/UpgradeResourceProvider.java | 4 ++--
.../server/customactions/ActionDefinition.java | 8
.../customactions/ActionDefinitionManager.java | 10 +-
.../server/state/stack/upgrade/StageWrapper.java | 8
.../controller/AmbariManagementControllerTest.java | 20 ++--
.../internal/ActionResourceProviderTest.java | 8
10 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
index e7a6430..3c185e7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
@@ -39,7 +39,7 @@ public class ActionExecutionContext {
private RequestOperationLevel operationLevel;
private Map parameters;
private TargetHostType targetType;
- private Short timeout;
+ private Integer timeout;
private String expectedServiceName;
private String expectedComponentName;
private boolean hostsInMaintenanceModeExcluded = true;
@@ -68,7 +68,7 @@ public class ActionExecutionContext {
public ActionExecutionContext(String clusterName, String actionName,
List resourceFilters,
Map parameters, TargetHostType targetType,
- Short timeout, String expectedServiceName,
+ Integer timeout, String expectedServiceName,
String expectedComponentName) {
this.clusterName = clusterName;
@@ -113,11 +113,11 @@ public class ActionExecutionContext {
return targetType;
}
- public Short getTimeout() {
+ public Integer getTimeout() {
return timeout;
}
- public void setTimeout(Short timeout) {
+ public void setTimeout(Integer timeout) {
this.timeout = timeout;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 30db434..c30a9b7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -435,7 +435,7 @@ public class AmbariCustomCommandExecutionHelper {
commandParams.put(CUSTOM_COMMAND, commandName);
boolean isInstallCommand =
commandName.equals(RoleCommand.INSTALL.toString());
- int commandTimeout =
Short.valueOf(configs.getDefaultAgentTaskTimeout(isInstallCommand)).intValue();
+ int commandTimeout =
Integer.valueOf(configs.getDefaultAgentTaskTimeout(isInstallCommand));
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index a78a947..c753e19 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -686,7 +686,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
INSTALL_PACKAGES_ACTION, Collections.singletonList(filter),
roleParams);
actionContext.setStackId(repoVersion.getStackId());
-
actionContext.setTimeout(Short.valueOf
[ambari] branch branch-2.6 updated: AMBARI-25290. backport for 2.6 - Custom timeout ignored, python script has been killed d… (#2994)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 8ee7c35 AMBARI-25290. backport for 2.6 - Custom timeout ignored,
python script has been killed d… (#2994)
8ee7c35 is described below
commit 8ee7c35cc3b08a0970822e0386fbc478b1fff28a
Author: Lisnichenko Dmitro
AuthorDate: Thu May 30 20:33:43 2019 +0300
AMBARI-25290. backport for 2.6 - Custom timeout ignored, python script has
been killed d… (#2994)
* AMBARI-25290. Custom timeout ignored, python script has been killed due
to timeout after waiting 2700 secs during HDP upgrade (dlysnichenko)
* AMBARI-25290. Custom timeout ignored, python script has been killed due
to timeout after waiting 2700 secs during HDP upgrade - address review comment
(dlysnichenko)
---
.../server/controller/ActionExecutionContext.java| 8
.../AmbariCustomCommandExecutionHelper.java | 2 +-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/HostStackVersionResourceProvider.java | 2 +-
.../controller/internal/UpgradeResourceProvider.java | 2 +-
.../server/customactions/ActionDefinition.java | 8
.../customactions/ActionDefinitionManager.java | 10 +-
.../server/state/stack/upgrade/StageWrapper.java | 8
.../controller/AmbariManagementControllerTest.java | 20 ++--
.../internal/ActionResourceProviderTest.java | 8
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
index 207dbfb..a3ff165 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
@@ -39,7 +39,7 @@ public class ActionExecutionContext {
private RequestOperationLevel operationLevel;
private Map parameters;
private TargetHostType targetType;
- private Short timeout;
+ private Integer timeout;
private String expectedServiceName;
private String expectedComponentName;
private boolean hostsInMaintenanceModeExcluded = true;
@@ -61,7 +61,7 @@ public class ActionExecutionContext {
public ActionExecutionContext(String clusterName, String actionName,
List resourceFilters,
Map parameters, TargetHostType targetType,
- Short timeout, String expectedServiceName,
+ Integer timeout, String expectedServiceName,
String expectedComponentName) {
this.clusterName = clusterName;
@@ -106,11 +106,11 @@ public class ActionExecutionContext {
return targetType;
}
- public Short getTimeout() {
+ public Integer getTimeout() {
return timeout;
}
- public void setTimeout(Short timeout) {
+ public void setTimeout(Integer timeout) {
this.timeout = timeout;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index dc3b08c..2b5be45 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -448,7 +448,7 @@ public class AmbariCustomCommandExecutionHelper {
}
boolean isInstallCommand =
commandName.equals(RoleCommand.INSTALL.toString());
- int commandTimeout =
Short.valueOf(configs.getDefaultAgentTaskTimeout(isInstallCommand)).intValue();
+ int commandTimeout =
Integer.valueOf(configs.getDefaultAgentTaskTimeout(isInstallCommand));
ComponentInfo componentInfo = ambariMetaInfo.getComponent(
stackId.getStackName(), stackId.getStackVersion(),
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index c21bd39..25cbcc6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -745,7 +745,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
roleParams);
actionContext.setRepositoryVersion(repoVersion);
-
actionContext.setTimeout(Short.valueOf(configuration.getDefaultAgentTaskTimeout(true)));
+
actionContext.setTimeout(Integer.valueOf
[ambari] branch branch-2.6 updated: AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs retrieving details for an Ambari View resource that does not exist - backport for 2.6 (dly
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new ab11712 AMBARI-25204. Ambari returns stack trace in HTML doc when an
error occurs retrieving details for an Ambari View resource that does not exist
- backport for 2.6 (dlysnichenko) (#2959)
ab11712 is described below
commit ab11712f3b47658083976be2ecadaa773dc02e55
Author: Lisnichenko Dmitro
AuthorDate: Mon May 6 12:39:23 2019 +0300
AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for an Ambari View resource that does not exist - backport
for 2.6 (dlysnichenko) (#2959)
---
.../server/api/services/ViewInstanceService.java | 131 -
1 file changed, 127 insertions(+), 4 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
index fa0850e..4f894f4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.services.serializers.JsonSerializer;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.security.authorization.AuthorizationException;
@@ -34,6 +35,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.util.HashMap;
@@ -215,20 +217,141 @@ public class ViewInstanceService extends BaseService {
ViewRegistry.getInstance().getInstanceDefinition(viewName, version,
instanceName);
if (instanceDefinition == null) {
- throw new IllegalArgumentException("A view instance " +
- viewName + "/" + instanceName + " can not be found.");
+ String msg = "A view instance " +
+ viewName + "/" + instanceName + " can not be found.";
+
+ return new NotFoundResponse(msg);
}
Object service = instanceDefinition.getService(resources);
if (service == null) {
- throw new IllegalArgumentException("A resource type " + resources + "
for view instance " +
- viewName + "/" + instanceName + " can not be found.");
+ String msg = "A resource type " + resources + " for view instance " +
+ viewName + "/" + instanceName + " can not be found.";
+ return new NotFoundResponse(msg);
}
return service;
}
/**
+ * Stub class for 404 error response
+ *
+ */
+ @Path("/")
+ public class NotFoundResponse {
+
+String msg;
+
+NotFoundResponse(String msg){
+ this.msg=msg;
+}
+
+/**
+ * Handles: GET /{resourceName}
+ * Handle GET resource with 404 response
+ * @return 404 response with msg
+ */
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public Response get() {
+ return getResponse();
+}
+
+/**
+ * Handles: POST /{resourceName}
+ * Handle POST resource with 404 response
+ * @return 404 response with msg
+ */
+@POST
+@Produces(MediaType.TEXT_PLAIN)
+public Response post() {
+ return getResponse();
+}
+
+/**
+ * Handles: PUT /{resourceName}
+ * Handle PUT resource with 404 response
+ * @return 404 response with msg
+ */
+@PUT
+@Produces(MediaType.TEXT_PLAIN)
+public Response put() {
+ return getResponse();
+}
+
+/**
+ * Handles: DELETE /{resourceName}
+ * Handle DELETE resource with 404 response
+ * @return 404 response with msg
+ */
+@DELETE
+@Produces(MediaType.TEXT_PLAIN)
+public Response delete() {
+ return getResponse();
+}
+
+/**
+ * Handles: GET /{resourceName}/{.*}
+ * Handle GET sub-resource with 404 response
+ * @return 404 response with msg
+ */
+@GET
+@Path("{path: .*}")
+@Produces(MediaType.TEXT_PLAIN)
+public Response getSub() {
+ return getResponse();
+}
+
+/**
+ * Handles: POST /{resourceName}/{.*}
+ * Handle POST sub-resource with 404 response
+ * @return 404 response with msg
+ */
+@POST
+@Path("{path: .*}")
+@Produces(MediaType.TEXT_PLAIN)
+public Response postSub() {
+
[ambari] branch branch-2.6 updated: AMBARI-25268. implement configurable password policy for Ambari users (dlysnichenko) (#2956)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 12275a4 AMBARI-25268. implement configurable password policy for
Ambari users (dlysnichenko) (#2956)
12275a4 is described below
commit 12275a46d69f559350a757de7f0825e8c78a0ea8
Author: Lisnichenko Dmitro
AuthorDate: Tue Apr 30 20:44:29 2019 +0300
AMBARI-25268. implement configurable password policy for Ambari users
(dlysnichenko) (#2956)
---
.../ambari/server/configuration/Configuration.java | 15 ++
.../server/security/authorization/Users.java | 21 ++
.../server/security/authorization/TestUsers.java | 32 ++
3 files changed, 68 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 352b9ae..f553905 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -515,6 +515,14 @@ public class Configuration {
"agent.ssl", "true");
/**
+ * Configurable password policy for Ambari users
+ */
+ @Markdown(
+ description = "Determines Ambari user password policy. Passwords should
match the regex")
+ public static final ConfigurationProperty PASSWORD_POLICY_REGEXP =
new ConfigurationProperty<>(
+ "security.password.policy.regexp", ".*");
+
+ /**
* Determines whether the Ambari Agent host names should be validated against
* a regular expression to ensure that they are well-formed.
*/
@@ -4133,6 +4141,13 @@ public class Configuration {
return getProperty(MYSQL_JAR_NAME);
}
+ /**
+ * @return Configurable password policy for Ambari users
+ */
+ public String getPasswordPolicyRegexp() {
+return getProperty(PASSWORD_POLICY_REGEXP);
+ }
+
public JPATableGenerationStrategy getJPATableGenerationStrategy() {
return JPATableGenerationStrategy.fromString(
System.getProperty(SERVER_JDBC_GENERATE_TABLES.getKey()));
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
index 0b869a5..5013987 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
@@ -26,6 +26,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
import javax.inject.Inject;
import javax.persistence.EntityManager;
@@ -187,6 +188,7 @@ public class Users {
if (currentUserName == null) {
throw new AmbariException("Authentication required. Please sign in.");
}
+validatePassword(newPassword);
UserEntity currentUserEntity =
userDAO.findLocalUserByName(currentUserName);
@@ -318,6 +320,9 @@ public class Users {
throw new AmbariException("User " + existingUser.getUserName() + "
already exists with type "
+ existingUser.getUserType());
}
+if (!StringUtils.isEmpty(password)) {
+ validatePassword(password);
+}
PrincipalTypeEntity principalTypeEntity =
principalTypeDAO.findById(PrincipalTypeEntity.USER_PRINCIPAL_TYPE);
if (principalTypeEntity == null) {
@@ -1041,4 +1046,20 @@ public class Users {
return implicitPrivileges;
}
+
+ /**
+ * Validates that password meets configured requirements according to
ambari.properties.
+ * @param password the password
+ * @throws IllegalArgumentException if password does not meet the password
policy requirements
+ */
+ public void validatePassword(String password) {
+if (StringUtils.isEmpty(password)) {
+ throw new IllegalArgumentException("The password does not meet the
password policy requirements");
+}
+String regexp = configuration.getPasswordPolicyRegexp();
+if (!StringUtils.isEmpty(regexp) && (!Pattern.matches(regexp,password))) {
+ final String msg = "The password does not meet the Ambari user password
policy regexp:" + regexp;
+ throw new IllegalArgumentException(msg);
+}
+ }
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
index 364664d..fb60f80 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
+++
b/ambari-server/src/test/java/org/apache/am
[ambari] branch branch-2.7 updated: AMBARI-25268. implement configurable password policy for Ambari users (dlysnichenko) (#2954)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 87e65b5 AMBARI-25268. implement configurable password policy for
Ambari users (dlysnichenko) (#2954)
87e65b5 is described below
commit 87e65b5f1cec08849939033c0958bbf39733c727
Author: Lisnichenko Dmitro
AuthorDate: Tue Apr 30 20:43:57 2019 +0300
AMBARI-25268. implement configurable password policy for Ambari users
(dlysnichenko) (#2954)
---
.../ambari/server/configuration/Configuration.java | 15 +++
.../controller/internal/UserResourceProvider.java | 8 +++-
.../ambari/server/security/authorization/Users.java | 19 +++
.../server/security/authorization/TestUsers.java| 21 +
4 files changed, 50 insertions(+), 13 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 09d90e8..747236c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -505,6 +505,14 @@ public class Configuration {
"agent.ssl", "true");
/**
+ * Configurable password policy for Ambari users
+ */
+ @Markdown(
+ description = "Determines Ambari user password policy. Passwords should
match the regex")
+ public static final ConfigurationProperty PASSWORD_POLICY_REGEXP =
new ConfigurationProperty<>(
+ "security.password.policy.regexp", ".*");
+
+ /**
* Determines whether the Ambari Agent host names should be validated against
* a regular expression to ensure that they are well-formed.
*/
@@ -3999,6 +4007,13 @@ public class Configuration {
return getProperty(MYSQL_JAR_NAME);
}
+ /**
+ * @return Configurable password policy for Ambari users
+ */
+ public String getPasswordPolicyRegexp() {
+return getProperty(PASSWORD_POLICY_REGEXP);
+ }
+
public JPATableGenerationStrategy getJPATableGenerationStrategy() {
return JPATableGenerationStrategy.fromString(
System.getProperty(SERVER_JDBC_GENERATE_TABLES.getKey()));
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
index 1177b57..29f1749 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
@@ -379,6 +379,12 @@ public class UserResourceProvider extends
AbstractControllerResourceProvider imp
String username = request.getUsername();
String displayName =
StringUtils.defaultIfEmpty(request.getDisplayName(), username);
String localUserName =
StringUtils.defaultIfEmpty(request.getLocalUserName(), username);
+ String password = request.getPassword();
+ // Setting a user's the password here is to allow for backward
compatibility with pre-Ambari-3.0
+ // versions so that the contract for REST API V1 is maintained.
+ if (!StringUtils.isEmpty(password)) {
+users.validatePassword(password);
+ }
UserEntity userEntity = users.createUser(username, localUserName,
displayName, request.isActive());
if (userEntity != null) {
@@ -388,7 +394,7 @@ public class UserResourceProvider extends
AbstractControllerResourceProvider imp
// Setting a user's the password here is to allow for backward
compatibility with pre-Ambari-3.0
// versions so that the contract for REST API V1 is maintained.
-if (!StringUtils.isEmpty(request.getPassword())) {
+if (!StringUtils.isEmpty(password)) {
// This is performed as a user administrator since the
authorization check was done prior
// to executing #createResourcesAuthorized.
addOrUpdateLocalAuthenticationSource(true, userEntity,
request.getPassword(), null);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
index 0974a72..3f81c52 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.regex.Pattern;
import javax.persistence.EntityManager;
import javax.p
[ambari] branch branch-2.7 updated: AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs retrieving details for an Ambari View resource that does not exist (#2912)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 e4e6cd5 AMBARI-25204. Ambari returns stack trace in HTML doc when an
error occurs retrieving details for an Ambari View resource that does not exist
(#2912)
e4e6cd5 is described below
commit e4e6cd5842191c6b89e6cb0b2a006fbe19069e7b
Author: Lisnichenko Dmitro
AuthorDate: Fri Apr 5 19:08:14 2019 +0300
AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for an Ambari View resource that does not exist (#2912)
* AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for an Ambari View resource that does not exist
(dlysnichenko)
* AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for an Ambari View resource that does not exist. Add
javadocs to fix checkstyle (dlysnichenko)
* AMBARI-25204. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for an Ambari View resource that does not exist. Add
javadocs to fix checkstyle (dlysnichenko)
---
.../ambari/server/api/services/BaseService.java| 1 +
.../api/services/views/ViewInstanceService.java| 140 -
2 files changed, 137 insertions(+), 4 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index b14ffa7..c439524 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -55,6 +55,7 @@ public abstract class BaseService {
public static final String MSG_INVALID_REQUEST = "Invalid request";
public static final String MSG_CLUSTER_NOT_FOUND = "Cluster not found";
public static final String MSG_CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host
not found";
+ public static final String MSG_VIEW_NOT_FOUND = "View not found";
public static final String MSG_NOT_AUTHENTICATED = "Not authenticated";
public static final String MSG_PERMISSION_DENIED = "Not permitted to perform
the operation";
public static final String MSG_SERVER_ERROR = "Internal server error";
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java
index 788a63a..53e6742 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java
@@ -38,6 +38,10 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.BaseService;
import org.apache.ambari.server.api.services.Request;
+import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.services.ResultImpl;
+import org.apache.ambari.server.api.services.ResultStatus;
+import org.apache.ambari.server.api.services.serializers.JsonSerializer;
import org.apache.ambari.server.controller.ViewInstanceResponse;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -316,19 +320,147 @@ public class ViewInstanceService extends BaseService {
ViewRegistry.getInstance().getInstanceDefinition(viewName, version,
instanceName);
if (instanceDefinition == null) {
- throw new IllegalArgumentException("A view instance " +
- viewName + "/" + instanceName + " can not be found.");
+ String msg = "A view instance " +
+ viewName + "/" + instanceName + " can not be found.";
+
+ return new NotFoundResponse(msg);
}
Object service = instanceDefinition.getService(resources);
if (service == null) {
- throw new IllegalArgumentException("A resource type " + resources + "
for view instance " +
- viewName + "/" + instanceName + " can not be found.");
+ String msg = "A resource type " + resources + " for view instance " +
+ viewName + "/" + instanceName + " can not be found.";
+ return new NotFoundResponse(msg);
}
return service;
}
+ /**
+ * Stub class for 404 error response
+ *
+ */
+ @Path("/")
+ public class NotFoundResponse {
+
+String msg;
+
+NotFoundResponse(String msg){
+ this.msg=msg;
[ambari] branch branch-2.7 updated: AMBARI-25200. Ambari returns stack trace in HTML doc when an error occurs retrieving details for a user resource that does not exist (dlysnichenko) (#2879)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 d7248a3 AMBARI-25200. Ambari returns stack trace in HTML doc when an
error occurs retrieving details for a user resource that does not exist
(dlysnichenko) (#2879)
d7248a3 is described below
commit d7248a3177bebbba66f7df9004ee85cb548e643b
Author: Lisnichenko Dmitro
AuthorDate: Tue Mar 19 18:46:00 2019 +0200
AMBARI-25200. Ambari returns stack trace in HTML doc when an error occurs
retrieving details for a user resource that does not exist (dlysnichenko)
(#2879)
---
.../server/controller/internal/UserPrivilegeResourceProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
index 7d66b48..5a5c870 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
@@ -279,7 +279,7 @@ public class UserPrivilegeResourceProvider extends
ReadOnlyResourceProvider {
}
}
usersCache.get().putAll(userNames);
- userEntity = usersCache.get().getUnchecked(userName);
+ userEntity = usersCache.get().getIfPresent(userName);
}
if (userEntity == null) {
@@ -287,7 +287,7 @@ public class UserPrivilegeResourceProvider extends
ReadOnlyResourceProvider {
}
if (userEntity == null) {
- throw new SystemException("User was not found");
+ throw new NoSuchParentResourceException("User was not found");
}
final Collection privileges =
users.getUserPrivileges(userEntity);
[ambari] branch trunk updated: AMBARI-25116. Fix other strange and buggy code (dlysnichenko) (#2785)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 cbd6284 AMBARI-25116. Fix other strange and buggy code (dlysnichenko) (#2785) cbd6284 is described below commit cbd628460a186991f8cf2c391657eb5891c2ab82 Author: Lisnichenko Dmitro AuthorDate: Wed Jan 30 16:46:05 2019 +0200 AMBARI-25116. Fix other strange and buggy code (dlysnichenko) (#2785) AMBARI-25116. Fix other strange and buggy code (dlysnichenko) --- ambari-server/pom.xml | 12 +++ .../ambari/server/agent/HeartbeatProcessor.java| 24 +++--- .../server/agent/stomp/AlertDefinitionsHolder.java | 14 ++-- .../resources/ExtensionLinkResourceDefinition.java | 5 -- .../api/resources/ExtensionResourceDefinition.java | 5 -- .../api/resources/MpackResourceDefinition.java | 5 -- .../api/resources/StackResourceDefinition.java | 5 -- .../server/checks/PluginChecksLoadedCheck.java | 17 ++-- .../ambari/server/configuration/Configuration.java | 2 +- .../controller/AmbariManagementControllerImpl.java | 8 +- .../server/controller/KerberosHelperImpl.java | 14 ++-- .../server/controller/StackServiceRequest.java | 6 +- .../controller/internal/AlertResourceProvider.java | 2 +- .../AmbariServerLDAPConfigurationHandler.java | 3 - ...erverStackAdvisorAwareConfigurationHandler.java | 5 -- .../internal/BlueprintConfigurationProcessor.java | 4 - .../internal/HostComponentResourceProvider.java| 4 +- .../internal/RequestResourceProvider.java | 4 +- .../internal/StackArtifactResourceProvider.java| 8 +- .../metrics/RestMetricsPropertyProvider.java | 10 +-- .../ganglia/GangliaHostPropertyProvider.java | 1 - .../ganglia/GangliaReportPropertyProvider.java | 15 ++-- .../timeline/AMSReportPropertyProvider.java| 5 +- .../state/HiveServiceCalculatedState.java | 4 +- .../customactions/ActionDefinitionManager.java | 2 +- .../listeners/upgrade/UpgradeUpdateListener.java | 3 +- .../system/impl/StompEventsMetricsSource.java | 6 +- .../dispatchers/AlertScriptDispatcher.java | 4 +- .../apache/ambari/server/orm/DBAccessorImpl.java | 4 +- .../orm/entities/RepositoryVersionEntity.java | 2 +- .../ambari/server/orm/helpers/ScriptRunner.java| 4 +- .../AmbariKerberosAuthenticationFilter.java| 18 ++--- .../authorization/AmbariAuthorizationFilter.java | 1 - .../security/encryption/CredentialProvider.java| 6 +- .../kerberos/CreateKeytabFilesServerAction.java| 2 +- .../UpdateKerberosConfigsServerAction.java | 22 +++--- .../serveraction/upgrades/ConfigureAction.java | 2 +- .../ambari/server/stack/ExtensionHelper.java | 2 +- .../ambari/server/stack/ServiceDirectory.java | 2 +- .../server/stack/upgrade/ClusterGrouping.java | 90 +++--- .../server/stack/upgrade/ColocatedGrouping.java| 16 ++-- .../ambari/server/stack/upgrade/ConfigureTask.java | 2 +- .../stack/upgrade/orchestrate/UpgradeHelper.java | 33 .../apache/ambari/server/state/ConfigHelper.java | 2 +- .../org/apache/ambari/server/state/ConfigImpl.java | 2 +- .../server/state/alert/AlertDefinitionHash.java| 2 +- .../topology/addservice/StackAdvisorAdapter.java | 4 +- .../ambari/server/update/HostUpdateHelper.java | 10 +-- .../ambari/server/upgrade/UpgradeCatalog260.java | 2 +- .../org/apache/ambari/server/utils/HTTPUtils.java | 10 +-- .../apache/ambari/server/utils/MpackVersion.java | 6 -- .../org/apache/ambari/server/utils/StageUtils.java | 18 ++--- .../ambari/server/view/HttpImpersonatorImpl.java | 10 +-- .../server/view/ViewSubResourceProvider.java | 3 +- .../api/services/PersistenceManagerImplTest.java | 2 +- .../controller/AmbariManagementControllerTest.java | 1 - .../HostComponentResourceProviderTest.java | 8 +- .../controller/internal/JMXHostProviderTest.java | 2 +- .../serveraction/upgrades/UpgradeActionTest.java | 7 +- .../topology/ClusterDeployWithStartOnlyTest.java | 3 +- ...terInstallWithoutStartOnComponentLevelTest.java | 3 +- .../topology/ClusterInstallWithoutStartTest.java | 3 +- .../server/topology/TopologyManagerTest.java | 3 +- .../validators/NameNodeHaValidatorTest.java| 1 - .../org/apache/ambari/view/utils/UserLocal.java| 8 +- 65 files changed, 208 insertions(+), 305 deletions(-) diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index fd8db02..24b95db 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -351,6 +351,18 @@ src/test/resources/mpacks_replay.log src/test/python/stacks/2.5/HIVE/*.txt src/test/python/mpacks/mystack-ambari-mpack-1.0.0.1/stacks/MYSTACK/3.0/services
[ambari] branch trunk updated: AMBARI-25116. Bug at AbstractProviderModule class (dlysnichenko) (#2774)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 10f955b AMBARI-25116. Bug at AbstractProviderModule class
(dlysnichenko) (#2774)
10f955b is described below
commit 10f955b8da9283a41deceb34387dbb7b71bc46e2
Author: Lisnichenko Dmitro
AuthorDate: Tue Jan 22 17:43:34 2019 +0200
AMBARI-25116. Bug at AbstractProviderModule class (dlysnichenko) (#2774)
* AMBARI-25116. Bug at AbstractProviderModule class (dlysnichenko)
* Fix mocks (test hangs on jenkins due to console input prompt) at
TestSensitiveDataEncryption.py
---
.../controller/internal/AbstractProviderModule.java | 14 --
.../src/test/python/TestSensitiveDataEncryption.py | 16 +++-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index cbafea7..90c0616 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.controller.internal;
+import static java.util.Collections.emptyMap;
import static
org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService.GANGLIA;
import static
org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService.TIMELINE_METRICS;
@@ -968,13 +969,14 @@ public abstract class AbstractProviderModule implements
ProviderModule,
ConfigurationResourceProvider.TYPE,
ConfigurationResourceProvider.TAG), configPredicate);
} catch (NoSuchResourceException e) {
- LOG.info("Resource for the desired config not found. " + e);
- return Collections.emptyMap();
+ LOG.info("Resource for the desired config not found.", e);
+ return emptyMap();
}
-for (Resource res : configResources) {
- return res.getPropertiesMap().get(PROPERTIES_CATEGORY);
-}
-return Collections.emptyMap();
+return configResources.stream()
+.findFirst()
+.map(res -> res.getPropertiesMap()
+.get(PROPERTIES_CATEGORY))
+.orElse(emptyMap());
}
private Map getDesiredConfigMap(String clusterName, String
versionTag,
diff --git a/ambari-server/src/test/python/TestSensitiveDataEncryption.py
b/ambari-server/src/test/python/TestSensitiveDataEncryption.py
index 4e839c4..8ff6588 100644
--- a/ambari-server/src/test/python/TestSensitiveDataEncryption.py
+++ b/ambari-server/src/test/python/TestSensitiveDataEncryption.py
@@ -488,7 +488,8 @@ class TestSensitiveDataEncryption(TestCase):
@patch("ambari_server.setupSecurity.is_root")
@patch("ambari_server.setupSecurity.sensitive_data_encryption")
@patch("ambari_server.setupSecurity.get_is_secure")
- def test_reset_master_key_persisted(self, get_is_secure_method,
sensitive_data_encryption_metod, is_root_method,
+ @patch("ambari_server.setupSecurity.get_is_persisted")
+ def test_reset_master_key_persisted(self, get_is_persisted_method,
get_is_secure_method, sensitive_data_encryption_metod, is_root_method,
get_ambari_properties_method,
search_file_message,
get_YN_input_method,
save_master_key_method,
update_properties_method,
@@ -511,6 +512,7 @@ class TestSensitiveDataEncryption(TestCase):
master_key = "aaa"
+get_is_persisted_method.return_value = (True, "filepath")
get_is_secure_method.return_value = True
get_YN_input_method.side_effect = [False, True, True]
read_master_key_method.return_value = master_key
@@ -518,7 +520,6 @@ class TestSensitiveDataEncryption(TestCase):
save_passwd_for_alias_method.return_value = 0
exists_mock.return_value = False
-
options = self._create_empty_options_mock()
setup_sensitive_data_encryption(options)
calls = [call(options, "decryption"), call(options, "encryption")]
@@ -547,7 +548,6 @@ class TestSensitiveDataEncryption(TestCase):
self.assertEquals(sorted_x, sorted_y)
pass
- @patch("ambari_server.setupSecurity.read_master_key")
@patch("os.path.exists")
@patch("ambari_server.setupSecurity.read_ambari_user")
@patch("ambari_server.setupSecurity.save_passwd_for_alias")
@@ -559,13 +559,13 @@ class TestSensitiveDataEncryption(TestCase):
@patch("ambari_server.setupSecurity.is_root")
@patc
[ambari] branch trunk updated: AMBARI-24745. Enable encryption of sensitive data in Ambari DB using … (#2755)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 97a6bc8 AMBARI-24745. Enable encryption of sensitive data in Ambari
DB using … (#2755)
97a6bc8 is described below
commit 97a6bc8b389fa5cfb73c87392af91e2d4d405ae3
Author: Lisnichenko Dmitro
AuthorDate: Fri Jan 18 17:07:53 2019 +0200
AMBARI-24745. Enable encryption of sensitive data in Ambari DB using …
(#2755)
AMBARI-24745. Enable encryption of sensitive data in Ambari DB using Ambari
CLI (dlysnichenko)
---
ambari-server/src/main/python/ambari-server.py | 6 +-
.../python/ambari_server/serverConfiguration.py| 8 +-
.../src/main/python/ambari_server/setupSecurity.py | 188 +++---
ambari-server/src/test/python/TestAmbariServer.py | 272 +
.../src/test/python/TestSensitiveDataEncryption.py | 667 +
5 files changed, 802 insertions(+), 339 deletions(-)
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 4539879..78d5405 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -54,7 +54,7 @@ from ambari_server.setupActions import BACKUP_ACTION,
LDAP_SETUP_ACTION, LDAP_SY
from ambari_server.setupHttps import setup_https, setup_truststore
from ambari_server.setupMpacks import install_mpack, uninstall_mpack,
upgrade_mpack, STACK_DEFINITIONS_RESOURCE_NAME, \
SERVICE_DEFINITIONS_RESOURCE_NAME, MPACKS_RESOURCE_NAME
-from ambari_server.setupSecurity import setup_ldap, sync_ldap,
setup_master_key, setup_ambari_krb5_jaas, setup_pam, \
+from ambari_server.setupSecurity import setup_ldap, sync_ldap,
setup_sensitive_data_encryption, setup_ambari_krb5_jaas, setup_pam, \
migrate_ldap_pam, LDAP_TYPES
from ambari_server.setupSso import setup_sso
from ambari_server.setupTrustedProxy import setup_trusted_proxy
@@ -253,7 +253,7 @@ def refresh_stack_hash_action():
def create_setup_security_actions(args):
action_list = [
['setup-https', 'Enable HTTPS for Ambari server.',
UserActionRestart(setup_https, args)],
- ['encrypt-passwords', 'Encrypt passwords stored in ambari.properties
file.', UserAction(setup_master_key, args)],
+ ['encrypt-passwords', 'Encrypt passwords managed by Ambari.',
UserAction(setup_sensitive_data_encryption, args)],
['setup-kerberos-jaas', 'Setup Ambari kerberos JAAS configuration.',
UserAction(setup_ambari_krb5_jaas, args)],
['setup-truststore', 'Setup truststore.',
UserActionRestart(setup_truststore, args)],
['import-certificate', 'Import certificate to truststore.',
UserActionRestart(setup_truststore, True, args)],
@@ -264,7 +264,7 @@ def create_setup_security_actions(args):
def create_setup_security_actions(args):
action_list = [
['setup-https', 'Enable HTTPS for Ambari server.',
UserActionRestart(setup_https, args)],
- ['encrypt-passwords', 'Encrypt passwords stored in ambari.properties
file.', UserAction(setup_master_key, args)],
+ ['encrypt-passwords', 'Encrypt passwords managed by Ambari.',
UserAction(setup_sensitive_data_encryption, args)],
['setup-kerberos-jaas', 'Setup Ambari kerberos JAAS configuration.',
UserAction(setup_ambari_krb5_jaas, args)],
['setup-truststore', 'Setup truststore.',
UserActionRestart(setup_truststore, args)],
['import-certificate', 'Import certificate to truststore.',
UserActionRestart(setup_truststore, args, True)],
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index fb0e0a2..f340ff6 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -608,6 +608,7 @@ SECURITY_KEY_IS_PERSISTED =
"security.master.key.ispersisted"
SECURITY_KEY_ENV_VAR_NAME = "AMBARI_SECURITY_MASTER_KEY"
SECURITY_MASTER_KEY_FILENAME = "master"
SECURITY_IS_ENCRYPTION_ENABLED = "security.passwords.encryption.enabled"
+SECURITY_SENSITIVE_DATA_ENCRYPTON_ENABLED =
"security.server.encrypt_sensitive_data"
SECURITY_KERBEROS_JASS_FILENAME = "krb5JAASLogin.conf"
SECURITY_PROVIDER_GET_CMD = "{0} -cp {1} " + \
@@ -625,6 +626,11 @@ SECURITY_PROVIDER_KEY_CMD = "{0} -cp {1} " + \
".MasterKeyServiceImpl {2} {3} {4} " + \
"> " + configDefaults.SERVER_OUT_FILE + " 2>&1"
+SECURITY_SENSITIVE_DATA_ENCRYPTON_CMD = "{0} -cp {1} " + \
+
"org.apache.ambari.server.security.encryption.SensitiveDataEncryption" + \
+"
[ambari] branch trunk updated: AMBARI-25019. Update Ambari audit logger to handle proxied users (dly… (#2702)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 0717fb8 AMBARI-25019. Update Ambari audit logger to handle proxied
users (dly… (#2702)
0717fb8 is described below
commit 0717fb84a2034b2204b346edcc86d94796f67395
Author: Lisnichenko Dmitro
AuthorDate: Mon Dec 31 20:14:24 2018 +0200
AMBARI-25019. Update Ambari audit logger to handle proxied users (dly…
(#2702)
AMBARI-25019. Update Ambari audit logger to handle proxied users
(dlysnichenko)
---
.../server/actionmanager/ActionDBAccessorImpl.java | 33 ---
.../ambari/server/api/services/LogoutService.java | 1 +
.../server/audit/event/AbstractUserAuditEvent.java | 24
.../audit/event/OperationStatusAuditEvent.java | 19 ++
.../server/audit/event/TaskStatusAuditEvent.java | 18 ++
.../AmbariAuthenticationEventHandlerImpl.java | 3 +
.../authorization/AmbariAuthorizationFilter.java | 3 +
.../authorization/AuthorizationHelper.java | 30 ++
.../audit/AccessUnauthorizedAuditEventTest.java| 19 ++
.../ambari/server/audit/LoginAuditEventTest.java | 68 ++
.../ambari/server/audit/LogoutAuditEventTest.java | 19 ++
.../audit/OperationStatusAuditEventTest.java | 5 +-
.../audit/StartOperationRequestAuditEventTest.java | 19 ++
.../server/audit/TaskStatusAuditEventTest.java | 5 +-
14 files changed, 227 insertions(+), 39 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 5c1fa66..7ab721b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -936,20 +936,22 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
RequestDetails requestDetails = new RequestDetails();
requestDetails.setNumberOfTasks(numberOfTasks);
requestDetails.setUserName(AuthorizationHelper.getAuthenticatedName());
+ requestDetails.setProxyUserName(AuthorizationHelper.getProxyUserName());
auditlogRequestCache.put(request.getRequestId(), requestDetails);
}
}
/**
* AuditLog operation status change
+ *
* @param requestId
*/
private void auditLog(HostRoleCommandEntity commandEntity, Long requestId) {
-if(!auditLogger.isEnabled()) {
+if (!auditLogger.isEnabled()) {
return;
}
-if(requestId != null) {
+if (requestId != null) {
HostRoleStatus lastTaskStatus = updateAuditlogCache(commandEntity,
requestId);
// details must not be null
@@ -961,12 +963,13 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
RequestEntity request = requestDAO.findByPK(requestId);
String context = request != null ? request.getRequestContext() :
null;
AuditEvent auditEvent = OperationStatusAuditEvent.builder()
-.withRequestId(String.valueOf(requestId))
-.withStatus(String.valueOf(calculatedStatus))
-.withRequestContext(context)
-.withUserName(details.getUserName())
-.withTimestamp(System.currentTimeMillis())
-.build();
+ .withRequestId(String.valueOf(requestId))
+ .withStatus(String.valueOf(calculatedStatus))
+ .withRequestContext(context)
+ .withUserName(details.getUserName())
+ .withProxyUserName(details.getProxyUserName())
+ .withTimestamp(System.currentTimeMillis())
+ .build();
auditLogger.log(auditEvent);
details.setLastStatus(calculatedStatus);
@@ -1011,6 +1014,7 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
.withTaskId(String.valueOf(commandEntity.getTaskId()))
.withHostName(commandEntity.getHostName())
.withUserName(details.getUserName())
+.withProxyUserName(details.getProxyUserName())
.withOperation(commandEntity.getRoleCommand() + " " +
commandEntity.getRole())
.withDetails(commandEntity.getCommandDetail())
.withStatus(commandEntity.getStatus().toString())
@@ -1047,6 +1051,11 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
*/
Map tasks = new HashMap<>();
+/**
+ * Name of the proxy user if proxied
+ */
+private String proxyUserName;
+
public HostRoleStatus getLastStatus() {
return lastStatus;
}
@@ -1083,6 +1092,14 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
return getTasks().values();
}
+public String getProxyUserName()
[ambari] branch trunk updated: AMBARI-24996. Hostname update command does not work if the new hostna… (#2688)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 642220e AMBARI-24996. Hostname update command does not work if the
new hostna… (#2688)
642220e is described below
commit 642220e874991f41f78f545a12ad85a654e4bd97
Author: Lisnichenko Dmitro
AuthorDate: Thu Dec 6 15:17:06 2018 +0200
AMBARI-24996. Hostname update command does not work if the new hostna…
(#2688)
AMBARI-24996. Hostname update command does not work if the new hostnames
contain the old hostnames also (dlysnichenko)
---
.../ambari/server/update/HostUpdateHelper.java | 52 --
.../ambari/server/update/HostUpdateHelperTest.java | 20 -
2 files changed, 39 insertions(+), 33 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
index 2b7129b..1d9b28f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
@@ -90,6 +90,7 @@ public class HostUpdateHelper {
(HostUpdateHelper.class);
private static final String AUTHENTICATED_USER_NAME = "ambari-host-update";
+ public static final String TMP_PREFIX = "tmpvalue";
private PersistService persistService;
@@ -403,20 +404,31 @@ public class HostUpdateHelper {
for (Map.Entry> clusterHosts :
hostChangesFileMap.entrySet()) {
String clusterName = clusterHosts.getKey();
Map hostMapping = clusterHosts.getValue();
- ClusterEntity clusterEntity = clusterDAO.findByName(clusterName);
- List currentHostNames = new ArrayList<>();
-
+ Map toTmpHostMapping = new HashMap<>();
+ Map fromTmpHostMapping = new HashMap<>();
for (Map.Entry hostPair : hostMapping.entrySet()) {
-currentHostNames.add(hostPair.getKey());
+toTmpHostMapping.put(hostPair.getKey(), TMP_PREFIX +
hostPair.getValue());
+fromTmpHostMapping.put(TMP_PREFIX + hostPair.getValue(),
hostPair.getValue());
}
+ ClusterEntity clusterEntity = clusterDAO.findByName(clusterName);
+ renameHostsInDB(hostDAO, toTmpHostMapping, clusterEntity);
+ renameHostsInDB(hostDAO, fromTmpHostMapping, clusterEntity);
+}
+ }
- if (clusterEntity != null) {
-Collection hostEntities = clusterEntity.getHostEntities();
-for (HostEntity hostEntity : hostEntities) {
- if (currentHostNames.contains(hostEntity.getHostName())) {
-hostEntity.setHostName(hostMapping.get(hostEntity.getHostName()));
-hostDAO.merge(hostEntity);
- }
+ private void renameHostsInDB(HostDAO hostDAO, Map
hostMapping, ClusterEntity clusterEntity) {
+List currentHostNames = new ArrayList<>();
+
+for (Map.Entry hostPair : hostMapping.entrySet()) {
+ currentHostNames.add(hostPair.getKey());
+}
+
+if (clusterEntity != null) {
+ Collection hostEntities = clusterEntity.getHostEntities();
+ for (HostEntity hostEntity : hostEntities) {
+if (currentHostNames.contains(hostEntity.getHostName())) {
+ hostEntity.setHostName(hostMapping.get(hostEntity.getHostName()));
+ hostDAO.merge(hostEntity);
}
}
}
@@ -534,6 +546,8 @@ public class HostUpdateHelper {
}
public static void main(String[] args) throws Exception {
+Injector injector = Guice.createInjector(new UpdateHelperModule(), new
CheckHelperAuditModule(), new LdapModule());
+HostUpdateHelper hostUpdateHelper =
injector.getInstance(HostUpdateHelper.class);
try {
LOG.info("Host names update started.");
@@ -542,10 +556,6 @@ public class HostUpdateHelper {
if (hostChangesFile == null || hostChangesFile.isEmpty()) {
throw new AmbariException("Path to file with host names changes is
empty or null.");
}
-
- Injector injector = Guice.createInjector(new UpdateHelperModule(), new
CheckHelperAuditModule(), new LdapModule());
- HostUpdateHelper hostUpdateHelper =
injector.getInstance(HostUpdateHelper.class);
-
hostUpdateHelper.setHostChangesFile(hostChangesFile);
hostUpdateHelper.initHostChangesFileMap();
@@ -566,15 +576,11 @@ public class HostUpdateHelper {
LOG.info("Host names update completed successfully.");
- hostUpdateHelper.stopPersistenceService();
-} catch (Throwable e) {
- if (e instanceof AmbariException) {
+} catch (AmbariException e) {
LOG.error("Exception occurred during host names update, failed", e);
-throw (AmbariException)e;
- }else{
-LOG.error("Unexpected error, host
[ambari] 01/02: AMBARI-24936. Validate cluster name character and length requirements in the backend before creating or updating a cluster (dlysnichenko)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 7202e06e85e57e79149dd94b6c8fb1130dcde580
Author: Lisnichenko Dmitro
AuthorDate: Wed Nov 21 16:54:26 2018 +0200
AMBARI-24936. Validate cluster name character and length requirements in
the backend before creating or updating a cluster (dlysnichenko)
---
.../controller/AmbariManagementControllerImpl.java | 40 ++-
.../AmbariManagementControllerImplTest.java| 59 ++
2 files changed, 88 insertions(+), 11 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 038c29c..05804af 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -82,6 +82,8 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.persistence.RollbackException;
@@ -294,6 +296,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
public static final String SKIP_INSTALL_FOR_COMPONENTS =
"skipInstallForComponents";
public static final String DONT_SKIP_INSTALL_FOR_COMPONENTS =
"dontSkipInstallForComponents";
+ public static final String CLUSTER_NAME_VALIDATION_REGEXP =
"^[a-zA-Z0-9_-]{1,100}$";
private final Clusters clusters;
@@ -1838,7 +1841,8 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
}
// set the new name of the cluster if change is requested
-if (!cluster.getClusterName().equals(request.getClusterName())) {
+if (request.getClusterName()!=null &&
!cluster.getClusterName().equals(request.getClusterName())) {
+ validateClusterName(request.getClusterName());
if (LOG.isDebugEnabled()) {
LOG.debug("Received cluster name change request from {} to {}",
cluster.getClusterName(), request.getClusterName());
}
@@ -2153,6 +2157,40 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
}
/**
+ * validate cluster name character and length requirements and throw
IllegalArgumentException if not valid.
+ *
+ * Character Requirements
+ *
+ * A through Z
+ * a through z
+ * 0 through 9
+ * _ (underscore)
+ * - (dash)
+ * Length Requirements
+ *
+ * Minimum: 1 character
+ * Maximum: 100 characters
+ * @see AmbariManagementControllerImpl#CLUSTER_NAME_VALIDATION_REGEXP
+ *
+ * @param clusterName name to validate
+ * @throws IllegalArgumentException if validation result
+ */
+ public static void validateClusterName(String clusterName) {
+if (clusterName == null) {
+ throw new IllegalArgumentException("Invalid arguments, cluster name
should not be null");
+}
+if (clusterName.isEmpty()) {
+ throw new IllegalArgumentException("Invalid arguments, cluster name
should not be empty");
+}
+Pattern clusterNamePtrn = Pattern.compile(CLUSTER_NAME_VALIDATION_REGEXP);
+Matcher mtch = clusterNamePtrn.matcher(clusterName);
+if(!mtch.matches()){
+ throw new IllegalArgumentException("Invalid arguments, cluster name
should contains only alphabetical, numeric, '_' and '-' characters and length
1-100 characters");
+}
+ }
+
+
+ /**
* Given a configuration request, compares the requested properties to the
current set of desired
* properties for the same configuration type and returns a map of property
names to an array of
* Strings representing the current value (index 0), and the requested value
(index 1).
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
index f1e408f..3442aaf 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
@@ -545,6 +545,53 @@ public class AmbariManagementControllerImplTest {
}
/**
+ * Ensure that validateClusterName(String clusterName) work as expected.
+ * Character Requirements
+ *
+ * A through Z
+ * a through z
+ * 0 through 9
+ * _ (underscore)
+ * - (dash)
+ * Length Requirements
+ *
+ * Minimum: 1 character
+ * Maximum: 100 charac
[ambari] 02/02: AMBARI-24936. Validate cluster name character and length requirements in the backend before creating or updating a cluster - address review comments (dlysnichenko)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 3a6e5ed0ac584946a732cf482d22fb65fbb3c12b
Author: Lisnichenko Dmitro
AuthorDate: Thu Nov 22 19:04:44 2018 +0200
AMBARI-24936. Validate cluster name character and length requirements in
the backend before creating or updating a cluster - address review comments
(dlysnichenko)
---
.../ambari/server/controller/AmbariManagementControllerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 05804af..096fc83 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -297,6 +297,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
public static final String SKIP_INSTALL_FOR_COMPONENTS =
"skipInstallForComponents";
public static final String DONT_SKIP_INSTALL_FOR_COMPONENTS =
"dontSkipInstallForComponents";
public static final String CLUSTER_NAME_VALIDATION_REGEXP =
"^[a-zA-Z0-9_-]{1,100}$";
+ public static final Pattern CLUSTER_NAME_PTRN =
Pattern.compile(CLUSTER_NAME_VALIDATION_REGEXP);
private final Clusters clusters;
@@ -2182,8 +2183,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
if (clusterName.isEmpty()) {
throw new IllegalArgumentException("Invalid arguments, cluster name
should not be empty");
}
-Pattern clusterNamePtrn = Pattern.compile(CLUSTER_NAME_VALIDATION_REGEXP);
-Matcher mtch = clusterNamePtrn.matcher(clusterName);
+Matcher mtch = CLUSTER_NAME_PTRN.matcher(clusterName);
if(!mtch.matches()){
throw new IllegalArgumentException("Invalid arguments, cluster name
should contains only alphabetical, numeric, '_' and '-' characters and length
1-100 characters");
}
[ambari] branch trunk updated (e60c026 -> 3a6e5ed)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from e60c026 AMBARI-24931. Bug at MetricsCollectorHAManager class. (mpapirkovskyy) (#2641) new 7202e06 AMBARI-24936. Validate cluster name character and length requirements in the backend before creating or updating a cluster (dlysnichenko) new 3a6e5ed AMBARI-24936. Validate cluster name character and length requirements in the backend before creating or updating a cluster - address review comments (dlysnichenko) The 2 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: .../controller/AmbariManagementControllerImpl.java | 40 ++- .../AmbariManagementControllerImplTest.java| 59 ++ 2 files changed, 88 insertions(+), 11 deletions(-)
[ambari] 02/02: AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 - address review comments (dlysnichenko)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit c36b478ab31ef6c6d9ac1194b1fe5c6a231f50ea
Author: Lisnichenko Dmitro
AuthorDate: Wed Nov 21 21:31:53 2018 +0200
AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 -
address review comments (dlysnichenko)
---
.../test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
index 99d463b..f591156 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
@@ -830,8 +830,8 @@ public class DBAccessorImplTest {
assertEquals(String.format("SELECT id, name FROM %s WHERE time='100'",
tableName),
dbAccessor.buildQuery(tableName, new String[] {"id", "name"}, new String[]
{"time"}, new String[] {"100"}));
-assertEquals(String.format("SELECT id, name FROM %s", tableName),
-dbAccessor.buildQuery(tableName, new String[] {"id", "name"}, null, null));
+assertEquals(String.format("SELECT id, name, time FROM %s", tableName),
+dbAccessor.buildQuery(tableName, new String[] {"id", "name", "time"},
null, null));
try {
dbAccessor.buildQuery("invalid_table_name", new String[] {"id", "name"},
new String[] {"time"}, new String[] {"100"});
[ambari] 01/02: AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 1cd9e6ffac280afaa7a7387fec47091bf17627fb
Author: Lisnichenko Dmitro
AuthorDate: Wed Nov 21 17:11:50 2018 +0200
AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936
---
.../java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/ActionResponse.java | 2 +-
.../java/org/apache/ambari/server/controller/ConfigurationRequest.java | 1 -
.../java/org/apache/ambari/server/controller/ConfigurationResponse.java | 2 --
.../java/org/apache/ambari/server/controller/ExtensionResponse.java | 2 +-
.../src/main/java/org/apache/ambari/server/controller/MpackRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/MpackResponse.java| 2 +-
.../main/java/org/apache/ambari/server/controller/StackResponse.java| 2 +-
.../ambari/server/controller/internal/PrivilegeResourceProvider.java| 2 +-
.../src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java | 2 +-
.../java/org/apache/ambari/server/orm/models/HostComponentSummary.java | 2 +-
.../server/serveraction/kerberos/CreateKeytabFilesServerAction.java | 2 +-
.../main/java/org/apache/ambari/server/state/ServiceComponentImpl.java | 2 +-
.../java/org/apache/ambari/server/controller/KerberosHelperTest.java| 1 -
.../ambari/server/controller/metrics/JMXPropertyProviderTest.java | 2 +-
15 files changed, 12 insertions(+), 16 deletions(-)
diff --git
a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
index ce87478..ce216d7 100644
---
a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
+++
b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
@@ -316,7 +316,7 @@ public class AmbariHttpWebRequest extends WebRequest {
} else if (httpMethod.equals("DELETE")) {
requestBase = new HttpDelete(getRequestUrl());
} else {
-new RuntimeException(String.format("Unsupported HTTP method:
%s", httpMethod));
+throw new RuntimeException(String.format("Unsupported HTTP
method: %s", httpMethod));
}
Map headers = getHeaders();
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
index 10af495..cbda0f5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
@@ -171,7 +171,7 @@ public class ActionResponse {
@Override
public int hashCode() {
-int result = 1;
+int result;
result = 31 + (actionName != null ? actionName.hashCode() : 0);
result = result + (actionType != null ? actionType.hashCode() : 0);
result = result + (inputs != null ? inputs.hashCode() : 0);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
index fddc674..f0998f1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
@@ -56,7 +56,6 @@ public class ConfigurationRequest {
this.configs = configs;
this.type = type;
this.tag = tag;
-this.configs = configs;
this.configsAttributes = configsAttributes;
this.includeProperties = (type != null && tag != null);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
index 37290b8..d8f471e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
@@ -64,7 +64,6 @@ public class ConfigurationResponse {
this.type = type;
this.versionTag = versionTag;
this.version = version;
-this.configs = configs;
this.configAttributes = configAttributes;
SecretReference.replacePasswordsWithReferencesForCustomProperties(configAttributes,
configs, type, version);
}
@@ -80,7 +79,6 @@ public class ConfigurationResponse {
this.type = type;
this.versionTag = versionTag;
this.version = version;
-this.configs = configs;
this.configAttributes = configAttributes;
[ambari] branch trunk updated (50ea420 -> c36b478)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 50ea420 [AMBARI-24914] Block Ozone datanode co-location with HDFS Datanode when added though the API (dsen) (#2623) new 1cd9e6f AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 new c36b478 AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 - address review comments (dlysnichenko) The 2 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: .../java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java | 2 +- .../main/java/org/apache/ambari/server/controller/ActionResponse.java | 2 +- .../org/apache/ambari/server/controller/ConfigurationRequest.java | 1 - .../org/apache/ambari/server/controller/ConfigurationResponse.java| 2 -- .../java/org/apache/ambari/server/controller/ExtensionResponse.java | 2 +- .../main/java/org/apache/ambari/server/controller/MpackRequest.java | 2 +- .../main/java/org/apache/ambari/server/controller/MpackResponse.java | 2 +- .../main/java/org/apache/ambari/server/controller/StackResponse.java | 2 +- .../ambari/server/controller/internal/PrivilegeResourceProvider.java | 2 +- .../src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java| 2 +- .../org/apache/ambari/server/orm/models/HostComponentSummary.java | 2 +- .../server/serveraction/kerberos/CreateKeytabFilesServerAction.java | 2 +- .../java/org/apache/ambari/server/state/ServiceComponentImpl.java | 2 +- .../java/org/apache/ambari/server/controller/KerberosHelperTest.java | 1 - .../ambari/server/controller/metrics/JMXPropertyProviderTest.java | 2 +- .../test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java| 4 ++-- 16 files changed, 14 insertions(+), 18 deletions(-)
[ambari] branch trunk updated: AMBARI-24871. Create an Ambari-server class that is called as an entr… (#2589)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 2bfbef2 AMBARI-24871. Create an Ambari-server class that is called as
an entr… (#2589)
2bfbef2 is described below
commit 2bfbef2cab3cac2c4720dca0942fed8d3efd9bc9
Author: Lisnichenko Dmitro
AuthorDate: Thu Nov 15 19:36:30 2018 +0200
AMBARI-24871. Create an Ambari-server class that is called as an entr…
(#2589)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data (dlysnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Fix spelling
(dlysnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Address review comments
(dlysnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Address review comments
(dlysnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Fix DI and tests
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Revert some cleanup
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data. Add test (dlysnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data - fix tests
(dlyscnichenko)
* AMBARI-24871. Create an Ambari-server class that is called as an entry
point to encrypt service configuration sensitive data - fix rat check
(dlyscnichenko)
---
.../configuration/ComponentSSLConfiguration.java | 2 +-
.../ambari/server/configuration/Configuration.java | 6 +-
.../internal/AmbariServerConfigurationHandler.java | 3 +-
.../security/encryption/AESEncryptionService.java | 8 +-
.../security/encryption/CredentialProvider.java| 19 +--
.../encryption/CredentialStoreServiceImpl.java | 10 +-
.../security/encryption/MasterKeyServiceImpl.java | 41 --
.../encryption/SensitiveDataEncryption.java| 142 ++
.../apache/ambari/server/utils/PasswordUtils.java | 17 ++-
.../server/configuration/ConfigurationTest.java| 6 +-
...ComponentConfigurationResourceProviderTest.java | 5 +-
.../encryption/CredentialProviderTest.java | 27 ++--
.../security/encryption/EncryptionServiceTest.java | 42 +-
.../security/encryption/MasterKeyServiceTest.java | 9 +-
.../encryption/SensitiveDataEncryptionTest.java| 161 +
.../ambari/server/utils/PasswordUtilsTest.java | 8 +-
16 files changed, 422 insertions(+), 84 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/ComponentSSLConfiguration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/ComponentSSLConfiguration.java
index a9d485f..81c64c7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/ComponentSSLConfiguration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/ComponentSSLConfiguration.java
@@ -118,7 +118,7 @@ public class ComponentSSLConfiguration {
private String getPassword(Configuration configuration) {
String rawPassword =
configuration.getProperty(Configuration.SSL_TRUSTSTORE_PASSWORD.getKey());
-String password=
PasswordUtils.getInstance().readPasswordFromStore(rawPassword,
configuration.getMasterKeyLocation(), configuration.isMasterKeyPersisted(),
configuration.getMasterKeyStoreLocation());
+String password=
PasswordUtils.getInstance().readPasswordFromStore(rawPassword, configuration);
return password == null ? rawPassword : password;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 63c1777..18ba439 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -2937,7 +2937,7 @@ public class Configuration {
System.setProperty(JAVAX_SSL_TRUSTSTORE,
getProperty(SSL_TRUSTSTORE_PATH));
}
if (getProperty(SSL_TRUSTSTORE_PASSWORD) != null) {
- String ts_password =
PasswordUtils.getInstance().readPasswordFromStore(getProperty(SSL_TRUSTSTORE_PASSWORD),
getMasterKeyLocation(), isMasterKeyPersisted(), getMasterKeyStoreLocation
[ambari] branch trunk updated: AMBARI-24840. Change Hostname does not honor uppercase hosts (dlisnic… (#2553)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 89de44a AMBARI-24840. Change Hostname does not honor uppercase hosts
(dlisnic… (#2553)
89de44a is described below
commit 89de44acf2106c4c70631db4dc253b940539f6dc
Author: Lisnichenko Dmitro
AuthorDate: Tue Oct 30 18:10:20 2018 +0200
AMBARI-24840. Change Hostname does not honor uppercase hosts (dlisnic…
(#2553)
* AMBARI-24840. Change Hostname does not honor uppercase hosts
(dlisnichenko)
* AMBARI-24840. Change Hostname does not honor uppercase hosts. Add unit
tests (dlisnichenko)
---
.../main/java/org/apache/ambari/server/update/HostUpdateHelper.java | 5 +++--
.../java/org/apache/ambari/server/update/HostUpdateHelperTest.java | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
index 27b4678..2b7129b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.ambari.server.AmbariException;
@@ -292,7 +293,7 @@ public class HostUpdateHelper {
for (String hostName : hostListForReplace) {
String code = String.format("{replace_code_%d}", counter++);
hostNameCode.put(hostName, code);
-updatedPropertyValue = updatedPropertyValue.replace(hostName, code);
+updatedPropertyValue = updatedPropertyValue.replaceAll("(?i)"+
Pattern.quote(hostName), code);
}
// replace codes with new host names according to ald host names
@@ -314,7 +315,7 @@ public class HostUpdateHelper {
if (value != null && hostNames != null && !value.isEmpty()) {
for (String host : hostNames) {
-if (value.contains(host)) {
+if (StringUtils.containsIgnoreCase(value, host)) {
includedHostNames.add(host);
}
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/update/HostUpdateHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/update/HostUpdateHelperTest.java
index 028f888..7029cbf 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/update/HostUpdateHelperTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/update/HostUpdateHelperTest.java
@@ -269,7 +269,7 @@ public class HostUpdateHelperTest {
});
hosts.put("host11","host55");
-hosts.put("host5","host1");
+hosts.put("HOST5","host1");
hosts.put("host1","host5");
hosts.put("host55","host11");
@@ -295,7 +295,7 @@ public class HostUpdateHelperTest {
expect(mockClusterConfigEntity1.getConfigId()).andReturn(1L).atLeastOnce();
expect(mockClusterConfigEntity1.getStack()).andReturn(mockStackEntity).atLeastOnce();
expect(mockClusterConfigEntity1.getData()).andReturn("{\"testProperty1\" :
\"testValue_host1\", " +
-"\"testProperty2\" : \"testValue_host5\", \"testProperty3\" :
\"testValue_host11\", " +
+"\"testProperty2\" : \"testValue_HOST5\", \"testProperty3\" :
\"testValue_host11\", " +
"\"testProperty4\" : \"testValue_host55\"}").atLeastOnce();
expect(mockClusterConfigEntity1.getTag()).andReturn("testTag1").atLeastOnce();
expect(mockClusterConfigEntity1.getType()).andReturn("testType1").atLeastOnce();
@@ -305,7 +305,7 @@ public class HostUpdateHelperTest {
expect(mockClusterConfigEntity2.getClusterId()).andReturn(1L).atLeastOnce();
expect(mockClusterConfigEntity2.getConfigId()).andReturn(2L).anyTimes();
expect(mockClusterConfigEntity2.getStack()).andReturn(mockStackEntity).atLeastOnce();
-expect(mockClusterConfigEntity2.getData()).andReturn("{\"testProperty5\" :
\"test_host1_test_host5_test_host11_test_host55\"}").atLeastOnce();
+expect(mockClusterConfigEntity2.getData()).andReturn("{\"testProperty5\" :
\"test_host1_test_HOST5_test_host11_test_host55\"}").atLeastOnce();
expect(mockClusterConfigEntity2.getTag()).andReturn("testTag2").atLeastOnce();
expect(mockClusterConfigEntity2.getType()).andReturn("testType2").atLeastOnce();
expect(mockClusterConfigEntity2.getVersion()).andReturn(2L).atLeastOnce();
[ambari] branch trunk updated: AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when master_key is not persisted (#2348)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 5f6e502 AMBARI-24646 'ambari-server setup-ldap' fails with
AttributeError when master_key is not persisted (#2348)
5f6e502 is described below
commit 5f6e50203f745891d7685bac027279083b5b640a
Author: Lisnichenko Dmitro
AuthorDate: Thu Sep 20 18:33:35 2018 +0300
AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (#2348)
* AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (+ fix for AMBARI-24663)(dlysnichenko)
* AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (+ fix for AMBARI-24663) - codestyle (dlysnichenko)
---
.../python/ambari_server/serverConfiguration.py| 44 +-
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index ca140d4..fb0e0a2 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -908,9 +908,9 @@ def read_passwd_for_alias(alias, masterKey="",
options=None):
with open(tempFilePath, 'w+'):
os.chmod(tempFilePath, stat.S_IREAD | stat.S_IWRITE)
-if options is not None and options.master_key is not None and
options.master_key:
+if options is not None and hasattr(options, 'master_key') and
options.master_key:
masterKey = options.master_key
-if masterKey is None or masterKey == "":
+if not masterKey:
masterKey = "None"
serverClassPath =
ambari_server.serverClassPath.ServerClassPath(get_ambari_properties(), None)
@@ -1017,17 +1017,8 @@ def get_web_server_startup_timeout(properties):
def get_original_master_key(properties, options = None):
input = True
masterKey = None
+ env_master_key = os.environ.get(SECURITY_KEY_ENV_VAR_NAME)
while(input):
-try:
- if options is not None and options.master_key is not None and
options.master_key:
-masterKey = options.master_key
- if masterKey is None:
-masterKey = get_validated_string_input('Enter current Master Key: ',
- "", ".*", "", True, False)
-except KeyboardInterrupt:
- print_warning_msg('Exiting...')
- sys.exit(1)
-
# Find an alias that exists
alias = None
property = properties.get_property(JDBC_PASSWORD_PROPERTY)
@@ -1045,11 +1036,30 @@ def get_original_master_key(properties, options = None):
alias = SSL_TRUSTSTORE_PASSWORD_ALIAS
# Decrypt alias with master to validate it, if no master return
-if alias and masterKey:
- password = read_passwd_for_alias(alias, masterKey, options)
- if not password:
-print_error_msg ("ERROR: Master key does not match.")
-continue
+password = None
+if alias and env_master_key and env_master_key is not "" and
env_master_key != "None":
+ password = read_passwd_for_alias(alias, env_master_key, options)
+if not password:
+ try:
+if options is not None and hasattr(options, 'master_key') and
options.master_key:
+ masterKey = options.master_key
+if not masterKey:
+ masterKey = get_validated_string_input('Enter current Master Key: ',
+ "", ".*", "", True, False)
+ if options is not None:
+options.master_key = masterKey
+ except KeyboardInterrupt:
+print_warning_msg('Exiting...')
+sys.exit(1)
+ if alias and masterKey:
+password = read_passwd_for_alias(alias, masterKey, options)
+if not password:
+ masterKey = None
+ if options is not None:
+options.master_key = None
+ print_error_msg ("ERROR: Master key does not match")
+
+ continue
input = False
[ambari] branch branch-2.7 updated: AMBARI-24663. 'ambari-server setup' does not use AMBARI_SECURITY_MASTER_KEY env var (dlysnichenko) (#2346)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 8d145e0 AMBARI-24663. 'ambari-server setup' does not use
AMBARI_SECURITY_MASTER_KEY env var (dlysnichenko) (#2346)
8d145e0 is described below
commit 8d145e0c04917866fd76690688826cf44065370e
Author: Lisnichenko Dmitro
AuthorDate: Wed Sep 19 18:18:30 2018 +0300
AMBARI-24663. 'ambari-server setup' does not use AMBARI_SECURITY_MASTER_KEY
env var (dlysnichenko) (#2346)
---
.../python/ambari_server/serverConfiguration.py| 45 --
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 005966c..ce27a9b 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1017,19 +1017,8 @@ def get_web_server_startup_timeout(properties):
def get_original_master_key(properties, options = None):
input = True
masterKey = None
+ env_master_key = os.environ.get(SECURITY_KEY_ENV_VAR_NAME)
while(input):
-try:
- if options is not None and hasattr(options, 'master_key') and
options.master_key is not None and options.master_key:
-masterKey = options.master_key
- if masterKey is None:
-masterKey = get_validated_string_input('Enter current Master Key: ',
- "", ".*", "", True, False)
-if options is not None:
- options.master_key = masterKey
-except KeyboardInterrupt:
- print_warning_msg('Exiting...')
- sys.exit(1)
-
# Find an alias that exists
alias = None
property = properties.get_property(JDBC_PASSWORD_PROPERTY)
@@ -1047,14 +1036,30 @@ def get_original_master_key(properties, options = None):
alias = SSL_TRUSTSTORE_PASSWORD_ALIAS
# Decrypt alias with master to validate it, if no master return
-if alias and masterKey:
- password = read_passwd_for_alias(alias, masterKey, options)
- if not password:
-masterKey = None
-if options is not None:
- options.master_key = None
-print_error_msg ("ERROR: Master key does not match.")
-continue
+password = None
+if alias and env_master_key and env_master_key is not "" and
env_master_key != "None":
+ password = read_passwd_for_alias(alias, env_master_key, options)
+if not password:
+ try:
+if options is not None and hasattr(options, 'master_key') and
options.master_key is not None and options.master_key:
+ masterKey = options.master_key
+if masterKey is None or masterKey == "":
+ masterKey = get_validated_string_input('Enter current Master Key: ',
+ "", ".*", "", True, False)
+ if options is not None:
+options.master_key = masterKey
+ except KeyboardInterrupt:
+print_warning_msg('Exiting...')
+sys.exit(1)
+ if alias and masterKey:
+password = read_passwd_for_alias(alias, masterKey, options)
+if not password:
+ masterKey = None
+ if options is not None:
+options.master_key = None
+ print_error_msg ("ERROR: Master key does not match")
+
+ continue
input = False
[ambari] branch branch-2.7 updated: AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when master_key is not persisted (#2330)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 80ecad6 AMBARI-24646 'ambari-server setup-ldap' fails with
AttributeError when master_key is not persisted (#2330)
80ecad6 is described below
commit 80ecad698d0bb1c43788bc09b77d539fb937e402
Author: Lisnichenko Dmitro
AuthorDate: Mon Sep 17 19:13:01 2018 +0300
AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (#2330)
* AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (dlysnichenko)
* AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted - small fix
---
.../src/main/python/ambari_server/serverConfiguration.py | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index ca140d4..005966c 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -908,7 +908,7 @@ def read_passwd_for_alias(alias, masterKey="",
options=None):
with open(tempFilePath, 'w+'):
os.chmod(tempFilePath, stat.S_IREAD | stat.S_IWRITE)
-if options is not None and options.master_key is not None and
options.master_key:
+if options is not None and hasattr(options, 'master_key') and
options.master_key is not None and options.master_key:
masterKey = options.master_key
if masterKey is None or masterKey == "":
masterKey = "None"
@@ -1019,11 +1019,13 @@ def get_original_master_key(properties, options = None):
masterKey = None
while(input):
try:
- if options is not None and options.master_key is not None and
options.master_key:
+ if options is not None and hasattr(options, 'master_key') and
options.master_key is not None and options.master_key:
masterKey = options.master_key
if masterKey is None:
masterKey = get_validated_string_input('Enter current Master Key: ',
"", ".*", "", True, False)
+if options is not None:
+ options.master_key = masterKey
except KeyboardInterrupt:
print_warning_msg('Exiting...')
sys.exit(1)
@@ -1048,6 +1050,9 @@ def get_original_master_key(properties, options = None):
if alias and masterKey:
password = read_passwd_for_alias(alias, masterKey, options)
if not password:
+masterKey = None
+if options is not None:
+ options.master_key = None
print_error_msg ("ERROR: Master key does not match.")
continue
[ambari] branch trunk updated: AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2297)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 c683a6b AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2297) c683a6b is described below commit c683a6b7c26591a7f6c1e6a2a3e3c89bacd9654c Author: Lisnichenko Dmitro AuthorDate: Wed Sep 12 17:33:22 2018 +0300 AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2297) --- ambari-agent/src/main/python/ambari_agent/security.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-agent/src/main/python/ambari_agent/security.py b/ambari-agent/src/main/python/ambari_agent/security.py index 983d990..e7c934c 100644 --- a/ambari-agent/src/main/python/ambari_agent/security.py +++ b/ambari-agent/src/main/python/ambari_agent/security.py @@ -37,7 +37,7 @@ from socket import error as socket_error logger = logging.getLogger(__name__) -GEN_AGENT_KEY = 'openssl req -new -newkey rsa:1024 -nodes -keyout "%(keysdir)s' \ +GEN_AGENT_KEY = 'openssl req -new -newkey rsa -nodes -keyout "%(keysdir)s' \ + os.sep + '%(hostname)s.key" -subj /OU=%(hostname)s/ ' \ '-out "%(keysdir)s' + os.sep + '%(hostname)s.csr"' KEY_FILENAME = '%(hostname)s.key'
[ambari] branch branch-2.7 updated: AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2298)
This is an automated email from the ASF dual-hosted git repository. dmitriusan 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 08f1971 AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2298) 08f1971 is described below commit 08f197107e67403ac9056690bd590dbddebd4bd4 Author: Lisnichenko Dmitro AuthorDate: Wed Sep 12 17:33:25 2018 +0300 AMBARI-24625. Ambari self signed certificate generated with 1024 bits length, need to make this 2048 (dlysnichenko) (#2298) --- ambari-agent/src/main/python/ambari_agent/security.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-agent/src/main/python/ambari_agent/security.py b/ambari-agent/src/main/python/ambari_agent/security.py index 983d990..e7c934c 100644 --- a/ambari-agent/src/main/python/ambari_agent/security.py +++ b/ambari-agent/src/main/python/ambari_agent/security.py @@ -37,7 +37,7 @@ from socket import error as socket_error logger = logging.getLogger(__name__) -GEN_AGENT_KEY = 'openssl req -new -newkey rsa:1024 -nodes -keyout "%(keysdir)s' \ +GEN_AGENT_KEY = 'openssl req -new -newkey rsa -nodes -keyout "%(keysdir)s' \ + os.sep + '%(hostname)s.key" -subj /OU=%(hostname)s/ ' \ '-out "%(keysdir)s' + os.sep + '%(hostname)s.csr"' KEY_FILENAME = '%(hostname)s.key'
[ambari] branch branch-2.7 updated: AMBARI-24595. PrincipalKeyCredential.equals fails for subtypes (dlysnichenko) (#2249)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 68bf0f4 AMBARI-24595. PrincipalKeyCredential.equals fails for
subtypes (dlysnichenko) (#2249)
68bf0f4 is described below
commit 68bf0f42df2addcec48be18dfc4d4ab9176afc37
Author: Lisnichenko Dmitro
AuthorDate: Thu Sep 6 12:39:32 2018 +0300
AMBARI-24595. PrincipalKeyCredential.equals fails for subtypes
(dlysnichenko) (#2249)
---
.../ambari/server/security/credential/PrincipalKeyCredential.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
index 9d5ae22..4133250 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
@@ -114,7 +114,7 @@ public class PrincipalKeyCredential implements Credential {
return false;
} else if (this == obj) {
return true;
-} else if (obj.getClass() == PrincipalKeyCredential.class) {
+} else if (obj.getClass() == this.getClass()) {
PrincipalKeyCredential other = (PrincipalKeyCredential) obj;
return ((this.principal == null) ? (other.principal == null) :
this.principal.equals(other.principal)) &&
((this.key == null) ? (other.key == null) : Arrays.equals(this.key,
other.key));
[ambari] branch trunk updated: AMBARI-24595. PrincipalKeyCredential.equals fails for subtypes (dlysnichenko) (#2250)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 8055899 AMBARI-24595. PrincipalKeyCredential.equals fails for
subtypes (dlysnichenko) (#2250)
8055899 is described below
commit 8055899fa892c0e6425cb70d97088491a0398267
Author: Lisnichenko Dmitro
AuthorDate: Thu Sep 6 12:31:59 2018 +0300
AMBARI-24595. PrincipalKeyCredential.equals fails for subtypes
(dlysnichenko) (#2250)
---
.../ambari/server/security/credential/PrincipalKeyCredential.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
index 9d5ae22..4133250 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
@@ -114,7 +114,7 @@ public class PrincipalKeyCredential implements Credential {
return false;
} else if (this == obj) {
return true;
-} else if (obj.getClass() == PrincipalKeyCredential.class) {
+} else if (obj.getClass() == this.getClass()) {
PrincipalKeyCredential other = (PrincipalKeyCredential) obj;
return ((this.principal == null) ? (other.principal == null) :
this.principal.equals(other.principal)) &&
((this.key == null) ? (other.key == null) : Arrays.equals(this.key,
other.key));
[ambari] branch branch-2.7 updated: AMBARI-24564. Zookeeper should handle a customized Zookeeper service … (#2203)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan 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 9f86a34 AMBARI-24564. Zookeeper should handle a customized Zookeeper
service … (#2203)
9f86a34 is described below
commit 9f86a344cc07fe426e4a72b989cd10267297acc5
Author: Lisnichenko Dmitro
AuthorDate: Wed Sep 5 19:44:22 2018 +0300
AMBARI-24564. Zookeeper should handle a customized Zookeeper service …
(#2203)
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name (dlysnichenko)
#
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name (dlysnichenko)
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name. Fix default value (dlysnichenko)
---
.../common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml| 2 +-
.../common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py| 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
index 868f520..deb0671 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
@@ -102,7 +102,7 @@ export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
{% if security_enabled %}
export SERVER_JVMFLAGS="$SERVER_JVMFLAGS
-Djava.security.auth.login.config={{zk_server_jaas_file}}"
-export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config={{zk_client_jaas_file}}"
+export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config={{zk_client_jaas_file}}
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
{% endif %}
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
index 96de22c..de4073a 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
@@ -81,7 +81,8 @@ else:
zoo_cfg_properties_map = {}
zoo_cfg_properties_map_length = len(zoo_cfg_properties_map)
-zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookee...@example.com")
+zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookeeper/_h...@example.com")
+zk_principal_user = zk_principal_name.split('/')[0]
zk_principal = zk_principal_name.replace('_HOST',hostname.lower())
java64_home = config['ambariLevelParams']['java_home']
[ambari] branch branch-2.7 updated (09400e2 -> 3c27139)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 09400e2 AMBARI-22863. Hive should handle a customized Zookeeper service princ… (#2244) add 8ff68e7 AMBARI-24565. HDFS should handle a customized Zookeeper service principal name (dlysnichenko) new 3c27139 Merge pull request #2204 from dlysnichenko/AMBARI-24565_branch-2.7 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: .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 4 .../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 3 +++ .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.4/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml| 5 - 6 files changed, 20 insertions(+), 1 deletion(-)
[ambari] 01/01: Merge pull request #2204 from dlysnichenko/AMBARI-24565_branch-2.7
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 3c27139b4c3573a05345ad26adfaf0b123b51bce Merge: 09400e2 8ff68e7 Author: Lisnichenko Dmitro AuthorDate: Wed Sep 5 15:59:42 2018 +0300 Merge pull request #2204 from dlysnichenko/AMBARI-24565_branch-2.7 AMBARI-24565. HDFS should handle a customized Zookeeper service princ… .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 4 .../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 3 +++ .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.4/services/HDFS/configuration/hadoop-env.xml| 3 +++ .../stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml| 5 - 6 files changed, 20 insertions(+), 1 deletion(-)
[ambari] branch trunk updated (7301ffc -> 4feee50)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 7301ffc AMBARI-24456. Ambari server can not start on latest Amazon Linux 2 (aonishuk) add d99ae01 AMBARI-24450. Remove dependencies with potential security vulnerabilities from fast-hdfs-resource (dlysnichenko) new 4feee50 Merge pull request #2015 from dlysnichenko/AMBARI-24450_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: contrib/fast-hdfs-resource/pom.xml | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-)
[ambari] 01/01: Merge pull request #2015 from dlysnichenko/AMBARI-24450_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 4feee50df3524ffab261375771fcb8c0151ef334 Merge: 7301ffc d99ae01 Author: Lisnichenko Dmitro AuthorDate: Fri Aug 10 15:51:15 2018 +0300 Merge pull request #2015 from dlysnichenko/AMBARI-24450_trunk AMBARI-24450. Remove dependencies with potential security vulnerabili… contrib/fast-hdfs-resource/pom.xml | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-)
[ambari] branch branch-2.7 updated (853fa62 -> 5d9901c)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 853fa62 AMBARI-24456. Ambari server can not start on latest Amazon Linux 2 (aonishuk) add 354e7ec AMBARI-24450. Remove dependencies with potential security vulnerabilities from fast-hdfs-resource (dlysnichenko) new 5d9901c Merge pull request #2014 from dlysnichenko/AMBARI-24450 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: contrib/fast-hdfs-resource/pom.xml | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-)
[ambari] 01/01: Merge pull request #2014 from dlysnichenko/AMBARI-24450
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 5d9901cbdeb3984d32ea07bbbe7237752e89d0d1 Merge: 853fa62 354e7ec Author: Lisnichenko Dmitro AuthorDate: Fri Aug 10 15:51:11 2018 +0300 Merge pull request #2014 from dlysnichenko/AMBARI-24450 AMBARI-24450. Remove dependencies with potential security vulnerabili… contrib/fast-hdfs-resource/pom.xml | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-)
[ambari] branch trunk updated (307a8cf -> 034f55a)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 307a8cf Merge pull request #1925 from hiveww/AMBARI-24388-trunk add 48c92cd AMBARI-24326. Upgrade creates flume kerberos principal, after removing flume service (dlysnichenko) add 0a9a15a Merge origin/trunk into AMBARI-24326_trunk add a091011 AMBARI-24326. Upgrade creates flume kerberos principal, after removig flume service - fix keytav creation for ambari-server new 034f55a Merge pull request #1828 from dlysnichenko/AMBARI-24326_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: .../events/publishers/AgentCommandsPublisher.java | 33 ++ .../kerberos/KerberosServerAction.java | 2 +- .../stageutils/KerberosKeytabController.java | 40 ++ .../ambari/server/agent/TestHeartbeatHandler.java | 2 ++ .../kerberos/KerberosServerActionTest.java | 1 + 5 files changed, 46 insertions(+), 32 deletions(-)
[ambari] 01/01: Merge pull request #1828 from dlysnichenko/AMBARI-24326_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 034f55afda5dac7bf5df72ebbb8a6ff6970dd25f Merge: 307a8cf a091011 Author: Lisnichenko Dmitro AuthorDate: Tue Jul 31 17:06:16 2018 +0300 Merge pull request #1828 from dlysnichenko/AMBARI-24326_trunk AMBARI-24326. Upgrade creates flume kerberos principal, after removin… .../events/publishers/AgentCommandsPublisher.java | 33 ++ .../kerberos/KerberosServerAction.java | 2 +- .../stageutils/KerberosKeytabController.java | 40 ++ .../ambari/server/agent/TestHeartbeatHandler.java | 2 ++ .../kerberos/KerberosServerActionTest.java | 1 + 5 files changed, 46 insertions(+), 32 deletions(-)
[ambari] 01/01: Merge pull request #1798 from dlysnichenko/AMBARI-24302_branch-2.7
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 1eb9c63a42217af4b30e28448a3494045dfd9b25 Merge: 8c6667a 4bf0440 Author: Lisnichenko Dmitro AuthorDate: Fri Jul 20 13:36:15 2018 +0300 Merge pull request #1798 from dlysnichenko/AMBARI-24302_branch-2.7 AMBARI-24302. -Dhdp.version shows blank value in process output for D… .../resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml | 2 -- 1 file changed, 2 deletions(-)
[ambari] branch branch-2.7 updated (8c6667a -> 1eb9c63)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 8c6667a [AMBARI-23890] [Logsearch UI] Column headers are missing in service logs tabular view (#1781) add 4bf0440 AMBARI-24302. -Dhdp.version shows blank value in process output for Datanodes new 1eb9c63 Merge pull request #1798 from dlysnichenko/AMBARI-24302_branch-2.7 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: .../resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml | 2 -- 1 file changed, 2 deletions(-)
[ambari] 01/01: Merge pull request #1784 from dlysnichenko/AMBARI-24302_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit eeedb39173de8371d34ec9c8572e4a7e919978d6 Merge: e6061fd 8706e65 Author: Lisnichenko Dmitro AuthorDate: Thu Jul 19 12:22:25 2018 +0300 Merge pull request #1784 from dlysnichenko/AMBARI-24302_trunk AMBARI-24302. -Dhdp.version shows blank value in process output for D… .../resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml | 2 -- 1 file changed, 2 deletions(-)
[ambari] branch trunk updated (e6061fd -> eeedb39)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from e6061fd AMBARI-24273. hadoop-env is not regenerated when OneFS is used as a FileSystem (amagyar) (#1773) add 8706e65 AMBARI-24302. -Dhdp.version shows blank value in process output for Datanodes new eeedb39 Merge pull request #1784 from dlysnichenko/AMBARI-24302_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: .../resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml | 2 -- 1 file changed, 2 deletions(-)
[ambari] 01/01: Merge pull request #1683 from dlysnichenko/AMBARI-24251_2.7
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git commit a19286d91240fc61b158f714329f8275e3d2ff3f Merge: 9a1c20b 214f7ce Author: Lisnichenko Dmitro AuthorDate: Thu Jul 5 23:19:07 2018 +0300 Merge pull request #1683 from dlysnichenko/AMBARI-24251_2.7 AMBARI-24251. Ambari Schema Upgrade is failing after creating views (… .../org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 12 .../apache/ambari/server/upgrade/UpgradeCatalog270Test.java | 12 2 files changed, 24 insertions(+)
[ambari] branch branch-2.7 updated (9a1c20b -> a19286d)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 9a1c20b [AMBARI-24229] Prevent Configuration Changes During Keytab Regeneration in an Upgrade add 214f7ce AMBARI-24251. Ambari Schema Upgrade is failing after creating views (dlysnichenko) new a19286d Merge pull request #1683 from dlysnichenko/AMBARI-24251_2.7 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: .../org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 12 .../apache/ambari/server/upgrade/UpgradeCatalog270Test.java | 12 2 files changed, 24 insertions(+)
[ambari] branch trunk updated (a100a99 -> 2e77158)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from a100a99 [AMBARI-24229] Prevent Configuration Changes During Keytab Regeneration in an Upgrade add 59f326c AMBARI-24251. Ambari Schema Upgrade is failing after creating views (dlysnichenko) new 2e77158 Merge pull request #1682 from dlysnichenko/AMBARI-24251_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: .../org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 12 .../apache/ambari/server/upgrade/UpgradeCatalog270Test.java | 12 2 files changed, 24 insertions(+)
[ambari] 01/01: Merge pull request #1682 from dlysnichenko/AMBARI-24251_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 2e7715872fd6224a42a7cec2bdcf63dca570e642 Merge: a100a99 59f326c Author: Lisnichenko Dmitro AuthorDate: Thu Jul 5 23:17:22 2018 +0300 Merge pull request #1682 from dlysnichenko/AMBARI-24251_trunk AMBARI-24251. Ambari Schema Upgrade is failing after creating views (… .../org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 12 .../apache/ambari/server/upgrade/UpgradeCatalog270Test.java | 12 2 files changed, 24 insertions(+)
[ambari] 01/01: Merge pull request #1617 from dlysnichenko/AMBARI-24182
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit ef128df09e1de986238b2ec1e54d707fe82575da Merge: cf17293 ac0e2ac Author: Lisnichenko Dmitro AuthorDate: Wed Jun 27 08:34:35 2018 +0300 Merge pull request #1617 from dlysnichenko/AMBARI-24182 AMBARI-24182. Assign Slaves and Clients Page missing warning message … .../AMBARI_INFRA_SOLR/0.1.0/service_advisor.py |2 +- .../AMBARI_METRICS/0.1.0/service_advisor.py|2 +- .../LOGSEARCH/0.5.0/service_advisor.py |2 +- .../ZEPPELIN/0.7.0/service_advisor.py |2 +- .../ZOOKEEPER/3.4.9/service_advisor.py |2 +- .../src/main/resources/stacks/service_advisor.py | 68 + .../src/test/python/TestServiceAdvisor.py | 72 + ambari-server/src/test/python/hdfs.json| 2689 .../src/test/python/validation-hosts.json | 191 ++ 9 files changed, 3025 insertions(+), 5 deletions(-)
[ambari] branch trunk updated (cf17293 -> ef128df)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from cf17293 AMBARI-23945. Add warning for migration config generation (if wrong host is used) add fbc0b10 AMBARI-24182. Assign Slaves and Clients Page missing warning message when no slave/client is selected (dlysnichenko) add ac0e2ac AMBARI-24182. Assign Slaves and Clients Page missing warning message when no slave/client is selected - add tests (dlysnichenko) new ef128df Merge pull request #1617 from dlysnichenko/AMBARI-24182 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_INFRA_SOLR/0.1.0/service_advisor.py |2 +- .../AMBARI_METRICS/0.1.0/service_advisor.py|2 +- .../LOGSEARCH/0.5.0/service_advisor.py |2 +- .../ZEPPELIN/0.7.0/service_advisor.py |2 +- .../ZOOKEEPER/3.4.9/service_advisor.py |2 +- .../src/main/resources/stacks/service_advisor.py | 68 + .../src/test/python/TestServiceAdvisor.py | 72 + ambari-server/src/test/python/hdfs.json| 2689 .../src/test/python/validation-hosts.json | 191 ++ 9 files changed, 3025 insertions(+), 5 deletions(-) create mode 100644 ambari-server/src/test/python/TestServiceAdvisor.py create mode 100644 ambari-server/src/test/python/hdfs.json create mode 100644 ambari-server/src/test/python/validation-hosts.json
[ambari] branch trunk updated (de66866 -> a5d4dea)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from de66866 AMBARI-24133. Deleting and adding the same host fails in Ambari (akovalenko) add 0f7994c AMBARI-24135. Stop of Knox Gateway fails after deleting Hive from cluster post upgrade. (dlysnichenko) new a5d4dea Merge pull request #1570 from dlysnichenko/AMBARI-24135 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: .../common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #1570 from dlysnichenko/AMBARI-24135
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit a5d4deab194c8372419e671ef2ceef6ccb8b7567 Merge: de66866 0f7994c Author: Lisnichenko Dmitro AuthorDate: Mon Jun 18 15:01:35 2018 +0300 Merge pull request #1570 from dlysnichenko/AMBARI-24135 AMBARI-24135. Stop of Knox Gateway fails after deleting Hive from clu… .../common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (2eb647a -> 2e31e81)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 2eb647a [AMBARI-24103] topology_script.py return incorrect data (dsen) (#1534) add b67a455 AMBARI-24099. Service check failure is not skipped during upgrade even though "Skip All Service Check Failures" options is selected before Upgrade Start (dlysnichenko) add 6176223 AMBARI-24099. Service check failure is not skipped during upgrade even though "Skip All Service Check Failures" options is selected before Upgrade Start. Fix review comments (dlysnichenko) new 2e31e81 Merge pull request #1532 from dlysnichenko/AMBARI-24099 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: .../internal/UpgradeResourceProvider.java | 1 + .../internal/UpgradeResourceProviderTest.java | 41 ++ 2 files changed, 42 insertions(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #1532 from dlysnichenko/AMBARI-24099
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 2e31e81b3df1aa5ff746d8550fdfc302341c101e Merge: 2eb647a 6176223 Author: Lisnichenko Dmitro AuthorDate: Fri Jun 15 17:31:49 2018 +0300 Merge pull request #1532 from dlysnichenko/AMBARI-24099 AMBARI-24099. Service check failure is not skipped during upgrade eve… .../internal/UpgradeResourceProvider.java | 1 + .../internal/UpgradeResourceProviderTest.java | 41 ++ 2 files changed, 42 insertions(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #1314 from dlysnichenko/AMBARI-23893
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 087d0356887a44bbe9361f2b5e6219dd681268db Merge: 0bae704 75e0c4a Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Fri May 18 17:29:28 2018 +0300 Merge pull request #1314 from dlysnichenko/AMBARI-23893 AMBARI-23893. Using Configs.py throws
[ambari] branch trunk updated (0bae704 -> 087d035)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 0bae704 AMBARI-23895 Configuration Validation is throwing errors on correct configuration add 75e0c4a AMBARI-23893. Using Configs.py throws
[ambari] branch trunk updated (dc078be -> b5659b4)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from dc078be AMBARI-23760 Dropdowns in Host Details Page do not conform to the new UI add eb73b74 AMBARI-23755. Exception: Expected confdir /usr/hdp/3.0.0.0-1252/accumulo/conf to be a symlink (dlysnichenko) new b5659b4 Merge pull request #1170 from dlysnichenko/AMBARI-23755 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: .../1.6.1.2.2.0/package/scripts/accumulo_configuration.py| 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #1170 from dlysnichenko/AMBARI-23755
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit b5659b4b94f8f0b17c0c5debfc9754e417dc253a Merge: dc078be eb73b74 Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Mon May 7 13:23:23 2018 +0300 Merge pull request #1170 from dlysnichenko/AMBARI-23755 AMBARI-23755. Exception: Expected confdir /usr/hdp/3.0.0.0-1252/accum… .../1.6.1.2.2.0/package/scripts/accumulo_configuration.py| 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (6329754 -> 169e278)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 6329754 Merge pull request #829 from hiveww/AMBARI-23404-trunk add ed7d2ac AMBARI-23403. Upgrade throws NullPointerException when configuration type is not selected (dlysnichenko) new 169e278 Merge pull request #828 from dlysnichenko/AMBARI-23403-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: .../src/main/java/org/apache/ambari/server/state/UpgradeHelper.java| 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #828 from dlysnichenko/AMBARI-23403-trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 169e27889dbeea3ec7e50fe94f552f5b9547ee61 Merge: 6329754 ed7d2ac Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Fri Mar 30 13:18:48 2018 +0300 Merge pull request #828 from dlysnichenko/AMBARI-23403-trunk AMBARI-23403. Upgrade throws NullPointerException when configuration … .../src/main/java/org/apache/ambari/server/state/UpgradeHelper.java| 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #658 from dlysnichenko/AMBARI-23234_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit cd914c5e320c0af79d8c7765936e45d859ca608a Merge: 8de19af 2c0b96f Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Fri Mar 16 08:43:15 2018 +0200 Merge pull request #658 from dlysnichenko/AMBARI-23234_trunk AMBARI-23234. Issue with zeppelin after upgrade (dlysnichenko) .../serveraction/upgrades/FixNotebookStorage.java | 26 -- 1 file changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (8de19af -> cd914c5)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 8de19af AMBARI-23024 Log Search UI: Implement Metadata patterns screen add 5d721d9 AMBARI-23234. Issue with zeppelin after upgrade (dlysnichenko) add 2c0b96f AMBARI-23234. Issue with zeppelin after upgrade. Additional changes (dlysnichenko) new cd914c5 Merge pull request #658 from dlysnichenko/AMBARI-23234_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: .../serveraction/upgrades/FixNotebookStorage.java | 26 -- 1 file changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #659 from dlysnichenko/AMBARI-23234_branch-2.6
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 2b638b39e002df95a1675c4a18929e9cca871a03 Merge: 9e18732 46f436c Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Thu Mar 15 18:07:12 2018 +0200 Merge pull request #659 from dlysnichenko/AMBARI-23234_branch-2.6 AMBARI-23234. Issue with zeppelin after upgrade (dlysnichenko) .../serveraction/upgrades/FixNotebookStorage.java | 26 -- 1 file changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch branch-2.6 updated (9e18732 -> 2b638b3)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 9e18732 Merge pull request #667 from hiveww/AMBARI-23214-branch-2.6 add 395886b AMBARI-23234. Issue with zeppelin after upgrade (dlysnichenko) add 46f436c AMBARI-23234. Issue with zeppelin after upgrade. Additional changes (dlysnichenko) new 2b638b3 Merge pull request #659 from dlysnichenko/AMBARI-23234_branch-2.6 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: .../serveraction/upgrades/FixNotebookStorage.java | 26 -- 1 file changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (626ff95 -> 27e7f20)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 626ff95 AMBARI-23184. Metrics Collector Install failed on HA cluster (aonishuk) add 13c818e AMBARI-23143. Failure while starting Spark2 service after performing ambari upgrade (dlysnichenko) new 27e7f20 Merge pull request #578 from dlysnichenko/AMBARI-23143_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: .../src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #578 from dlysnichenko/AMBARI-23143_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 27e7f200c686d788a892098d35ee8a4a5a264154 Merge: 626ff95 13c818e Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Fri Mar 9 15:19:31 2018 +0200 Merge pull request #578 from dlysnichenko/AMBARI-23143_trunk AMBARI-23143. Failure while starting Spark2 service after performing ambari upgrade - for trunk .../src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch branch-2.6 updated (b55567c -> bd0c6d2)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from b55567c AMBARI-23174 : Add storm topology metric expressions for custom downsampling config. add 4bf5d3c AMBARI-23143. Failure while starting Spark2 service after performing ambari upgrade (dlysnichenko) new bd0c6d2 Merge pull request #577 from dlysnichenko/AMBARI-23143_branch-2.6 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: .../src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #577 from dlysnichenko/AMBARI-23143_branch-2.6
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git commit bd0c6d29baa54d1d819c0864d96aea452c3b70fa Merge: b55567c 4bf5d3c Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Thu Mar 8 14:40:42 2018 +0200 Merge pull request #577 from dlysnichenko/AMBARI-23143_branch-2.6 [Ambari-23143] Failure while starting Spark2 service after performing ambari upgrade - for branch 2.6 .../src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch branch-2.6 updated (33e1f57 -> 5c79ab6)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 33e1f57 AMBARI-23109. Upgrading org.apache.httpcomponents:httpclient dependency to v4.5.5 due to security concerns (#502) add c85b9ac AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster (dlysnichenko) add cb5208d AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster -add 2.6->2.6 upgrade path as well (dlysnichenko) add f96779d AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster (dlysnichenko) add 463066a AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster - fix review comment (dlysnichenko) new 5c79ab6 Merge pull request #504 from dlysnichenko/AMBARI-23113_branch-2.6 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: .../serveraction/upgrades/FixNotebookStorage.java | 84 ++ .../0.7.0/configuration/zeppelin-config.xml| 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml| 5 ++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml| 3 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml| 7 ++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml| 6 ++ 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixNotebookStorage.java -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #504 from dlysnichenko/AMBARI-23113_branch-2.6
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 5c79ab686b56cf4b56dbb08d14c264cb99f80229 Merge: 33e1f57 463066a Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Tue Mar 6 12:39:02 2018 +0200 Merge pull request #504 from dlysnichenko/AMBARI-23113_branch-2.6 AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in… .../serveraction/upgrades/FixNotebookStorage.java | 84 ++ .../0.7.0/configuration/zeppelin-config.xml| 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml| 5 ++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml| 3 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml| 7 ++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml| 6 ++ 6 files changed, 106 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #503 from dlysnichenko/AMBARI-23113_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit d7e76cdf76d548beb6778cd62336f30f4e239d8b Merge: cee8deb f1259a6 Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Tue Mar 6 12:38:52 2018 +0200 Merge pull request #503 from dlysnichenko/AMBARI-23113_trunk AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in… .../serveraction/upgrades/FixNotebookStorage.java | 84 ++ .../0.7.0/configuration/zeppelin-config.xml| 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml| 5 ++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml| 3 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml| 7 ++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml| 6 ++ 6 files changed, 106 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (cee8deb -> d7e76cd)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from cee8deb Merge pull request #479 from hiveww/AMBARI-23090-trunk add 979bd26 AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster (dlysnichenko) add a91dba0 AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster -add 2.6->2.6 upgrade path as well (dlysnichenko) add e0ba356 AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster (dlysnichenko) add f1259a6 AMBARI-23113. Notebook storage still configured to VFSNotebookRepo in upgraded cluster - fix review comment (dlysnichenko) new d7e76cd Merge pull request #503 from dlysnichenko/AMBARI-23113_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: .../serveraction/upgrades/FixNotebookStorage.java | 84 ++ .../0.7.0/configuration/zeppelin-config.xml| 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml| 5 ++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml| 3 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml| 7 ++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml| 6 ++ 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixNotebookStorage.java -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (2b0164a -> ea556ed)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 2b0164a AMBARI-23068 Service Auto Start cannot be disabled add 21a174d AMBARI-23110. livy2-client version is not updated as part of Patch Upgrade. (dlysnichenko) new ea556ed Merge pull request #500 from dlysnichenko/AMBARI-23110_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: .../resources/stacks/HDP/2.0.6/properties/stack_packages.json| 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #500 from dlysnichenko/AMBARI-23110_trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit ea556ed03589666761043397adddabb514062fd5 Merge: 2b0164a 21a174d Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Fri Mar 2 13:15:56 2018 +0200 Merge pull request #500 from dlysnichenko/AMBARI-23110_trunk [AMBARI-23110]. livy2-client version is not updated as part of Patch Up… .../resources/stacks/HDP/2.0.6/properties/stack_packages.json| 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #499 from dlysnichenko/AMBARI-23110_branch_2.6
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 14bebf0cfd9453926c713a5de49a382c2239d577 Merge: ccd31b6 3886270 Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Thu Mar 1 13:26:27 2018 +0200 Merge pull request #499 from dlysnichenko/AMBARI-23110_branch_2.6 [AMBARI-23110]. livy2-client version is not updated as part of Patch Up… .../resources/stacks/HDP/2.0.6/properties/stack_packages.json| 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch branch-2.6 updated (ccd31b6 -> 14bebf0)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from ccd31b6 AMBARI-23093. Eliminated the org.apache.zookeeper:zookeeper dependency due to security concerns (#493) add 3886270 AMBARI-23110. livy2-client version is not updated as part of Patch Upgrade. (dlysnichenko) new 14bebf0 Merge pull request #499 from dlysnichenko/AMBARI-23110_branch_2.6 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: .../resources/stacks/HDP/2.0.6/properties/stack_packages.json| 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #405 from smolnar82/AMBARI-23020
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 80d3dca600253820468d0d940bdd95ba76ef88d2 Merge: ef35fb0 55b3001 Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Wed Feb 21 15:26:09 2018 +0200 Merge pull request #405 from smolnar82/AMBARI-23020 [AMBARI-23020] Decreasing the log level from WARN to DEBUG in case we use the default value of an undefined LDAP configuration element .../org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (ef35fb0 -> 80d3dca)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from ef35fb0 Merge pull request #403 from smolnar82/AMBARI-22944 add 55b3001 AMBARI-23020. Decreasing the log level from WARN to DEBUG in case we use the default value of an undefined LDAP configuration element new 80d3dca Merge pull request #405 from smolnar82/AMBARI-23020 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: .../org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (957dd89 -> ef35fb0)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 957dd89 AMBARI-23025. NN Federation Wizard: implement step2 (akovalenko) add eebcfed AMBARI-22944. Using the proper variable when checking emptiness new ef35fb0 Merge pull request #403 from smolnar82/AMBARI-22944 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: .../apache/ambari/server/state/kerberos/KerberosKeytabDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #403 from smolnar82/AMBARI-22944
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit ef35fb0da672e53a03038581af7ac6d0f73048bb Merge: 957dd89 eebcfed Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Wed Feb 21 15:25:19 2018 +0200 Merge pull request #403 from smolnar82/AMBARI-22944 [AMBARI-22944] Using the proper variable when checking emptiness .../apache/ambari/server/state/kerberos/KerberosKeytabDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #413 from dlysnichenko/AMBARI-23034-trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit c339e6f778a74e2281b8a629632830087991f899 Merge: ce485b7 003102b Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Tue Feb 20 19:11:30 2018 +0200 Merge pull request #413 from dlysnichenko/AMBARI-23034-trunk [AMBARI-23034] Create HDP 2.6 to HDP 3.0 express upgrade pack .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 17 + .../HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml| 1337 2 files changed, 1354 insertions(+) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch trunk updated (ce485b7 -> c339e6f)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from ce485b7 Merge pull request #409 from hiveww/AMBARI-23030-trunk add 18e4da8 AMBARI-23034 Create HDP 2.6 to HDP 3.0 express upgrade pack (dlysnichenko) add 003102b AMBARI-23034. Create HDP 2.6 to HDP 3.0 express upgrade pack - add existing config changes (dlysnichenko) new c339e6f Merge pull request #413 from dlysnichenko/AMBARI-23034-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: .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 17 + .../HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml| 1337 2 files changed, 1354 insertions(+) create mode 100644 ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] branch branch-2.6 updated (ab3d854 -> e670279)
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from ab3d854 Merge pull request #361 from avijayanhwx/AMBARI-22991-branch-2.6 add 16bbca3 AMBARI-22986. Not able to add Livy2 after doing rolling upgrade to M21 (dlysnichenko) add c3ee121 AMBARI-22986. Not able to add Livy2 after doing rolling upgrade to M21 - fixed review comments (dlysnichenko) add e2e4629 AMBARI-22986. Not able to add Livy2 after doing rolling upgrade to M21 - add tests (dlysnichenko) new e670279 Merge pull request #355 from dlysnichenko/AMBARI-22986-branch-2.6 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: .../internal/UpgradeResourceProvider.java | 10 .../ambari/server/upgrade/UpgradeCatalog262.java | 28 ++ .../internal/UpgradeResourceProviderTest.java | 13 -- 3 files changed, 49 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
[ambari] 01/01: Merge pull request #356 from dlysnichenko/AMBARI-22986-trunk
This is an automated email from the ASF dual-hosted git repository. dmitriusan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 79c1a134c1af2b17c1a16fda4ca1c9771b779e53 Merge: d07395a bbb5900 Author: Lisnichenko Dmitro <dmitriu...@apache.org> AuthorDate: Thu Feb 15 13:17:26 2018 +0200 Merge pull request #356 from dlysnichenko/AMBARI-22986-trunk [AMBARI-2298] trunk . Not able to add Livy2 after doing rolling upgrade to M21 .../internal/UpgradeResourceProvider.java | 10 .../ambari/server/upgrade/UpgradeCatalog262.java | 28 ++ .../internal/UpgradeResourceProviderTest.java | 13 -- 3 files changed, 49 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact dmitriu...@apache.org.
