[ambari] branch branch-2.6 updated: AMBARI-25443. Create principal/keytab operation with multi threaded (dgrinenko)
This is an automated email from the ASF dual-hosted git repository.
hapylestat 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 2616503 AMBARI-25443. Create principal/keytab operation with multi
threaded (dgrinenko)
2616503 is described below
commit 26165032d50ff1059229424bbe3c16b36b77ce4e
Author: Dmitry Grinenko
AuthorDate: Mon Dec 9 09:18:29 2019 +0200
AMBARI-25443. Create principal/keytab operation with multi threaded
(dgrinenko)
---
.../ambari/server/configuration/Configuration.java | 34
.../server/controller/KerberosHelperImpl.java | 3 +-
.../HostKerberosIdentityResourceProvider.java | 8 +-
.../ConfigureAmbariIdentitiesServerAction.java | 41 +++--
.../kerberos/CreateKeytabFilesServerAction.java| 203 +++--
.../kerberos/CreatePrincipalsServerAction.java | 35 +++-
.../kerberos/DestroyPrincipalsServerAction.java| 98 +-
.../kerberos/FinalizeKerberosServerAction.java | 18 +-
.../kerberos/KerberosServerAction.java | 81 ++--
.../HostKerberosIdentityResourceProviderTest.java | 18 +-
.../AbstractPrepareKerberosServerActionTest.java | 25 +--
.../ConfigureAmbariIdentitiesServerActionTest.java | 2 +
.../kerberos/FinalizeKerberosServerActionTest.java | 2 +
.../server/view/HttpImpersonatorImplTest.java | 1 -
14 files changed, 380 insertions(+), 189 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 f553905..67c6967 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
@@ -2736,6 +2736,20 @@ public class Configuration {
public static final ConfigurationProperty TLS_EPHEMERAL_DH_KEY_SIZE
= new ConfigurationProperty<>(
"security.server.tls.ephemeral_dh_key_size", 2048);
+ /**
+ * The number of threads to use when executing server-side Kerberos
commands, such as generate keytabs.
+ */
+ @Markdown(description = "The number of threads to use when executing
server-side Kerberos commands, such as generate keytabs.")
+ public static final ConfigurationProperty
KERBEROS_SERVER_ACTION_THREADPOOL_SIZE = new ConfigurationProperty<>(
+"server.kerberos.action.threadpool.size", 1);
+
+ /**
+ * The timeout, in seconds, when finalizing Kerberos
enable/disable/regenerate commands.
+ */
+ @Markdown(description = "The timeout, in seconds, when finalizing Kerberos
enable/disable/regenerate commands.")
+ public static final ConfigurationProperty
KERBEROS_SERVER_ACTION_FINALIZE_SECONDS = new ConfigurationProperty<>(
+"server.kerberos.finalize.timeout", 600);
+
private static final Logger LOG = LoggerFactory.getLogger(
Configuration.class);
@@ -5619,6 +5633,26 @@ public class Configuration {
}
/**
+ * Gets the number of threads to use when executing server-side Kerberos
+ * commands, such as generate keytabs.
+ *
+ * @return the threadpool size, defaulting to 1
+ */
+ public int getKerberosServerActionThreadpoolSize() {
+return
Integer.parseInt(getProperty(KERBEROS_SERVER_ACTION_THREADPOOL_SIZE));
+ }
+
+ /**
+ * Get the timeout, in seconds, when finalizing Kerberos
+ * enable/disable/regenerate commands.
+ *
+ * @return the timeout, in seconds, defaulting to 600.
+ */
+ public int getKerberosServerActionFinalizeTimeout() {
+return
Integer.parseInt(getProperty(KERBEROS_SERVER_ACTION_FINALIZE_SECONDS));
+ }
+
+ /**
* Generates a markdown table which includes:
*
* Property key name
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index 4402d4e..0e3560b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -3637,6 +3637,7 @@ public class KerberosHelperImpl implements KerberosHelper
{
commandParameters.put(KerberosServerAction.DATA_DIRECTORY,
dataDirectory.getAbsolutePath());
}
+ int timeout = configuration.getKerberosServerActionFinalizeTimeout();
Stage stage =
createServerActionStage(requestStageContainer.getLastStageId(),
cluster,
requestStageContainer.getId(),
@@ -3646,7 +3647,7 @@ public class KerberosHelperImpl implements KerberosHelper
{
FinalizeKerberosServerAction.class,
event,
commandParameters,
- "Finalize Operations", 300);
+ "Finalize Operations", timeout);
RoleGraph roleGraph =
[ambari] branch branch-2.6 updated (c763113 -> ccf2d22)
This is an automated email from the ASF dual-hosted git repository. hapylestat pushed a change to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git. from c763113 [AMBARI-25362] Hive View throws TimeoutException deadline passed for few queries randomly.( Sreenath Somarajapuram) (#3072) add ccf2d22 AMBARI-25218 Updating com.google.guava:guava version No new revisions were added by this update. Summary of changes: ambari-admin/pom.xml | 2 +- ambari-agent/pom.xml | 28 +- .../org/apache/ambari/tools/zk/ZkMigratorTest.java | 2 +- ambari-logsearch/ambari-infra-solr-plugin/pom.xml | 4 ++-- .../ambari-logsearch-logfeeder/pom.xml | 7 +++--- ambari-logsearch/ambari-logsearch-portal/pom.xml | 24 +-- ambari-logsearch/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-common/pom.xml | 9 ++- ambari-metrics/ambari-metrics-flume-sink/pom.xml | 7 +- ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 2 +- .../ambari-metrics-host-monitoring/pom.xml | 2 +- ambari-metrics/ambari-metrics-kafka-sink/pom.xml | 2 +- .../ambari-metrics-storm-sink-legacy/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-storm-sink/pom.xml | 4 ++-- .../ambari-metrics-timelineservice/pom.xml | 9 --- .../loadsimulator/net/RestMetricsSender.java | 2 +- .../TestApplicationHistoryServer.java | 2 +- ambari-metrics/pom.xml | 25 ++- ambari-project/pom.xml | 4 ++-- .../server/orm/entities/ClusterConfigEntity.java | 4 +++- .../entities/HostComponentDesiredStateEntity.java | 3 ++- .../orm/entities/HostComponentStateEntity.java | 3 ++- .../orm/entities/RepositoryVersionEntity.java | 3 ++- .../server/orm/entities/UpgradeHistoryEntity.java | 3 ++- .../upgrades/FinalizeUpgradeAction.java| 3 ++- .../apache/ambari/server/state/UpgradeContext.java | 3 ++- .../state/stack/upgrade/ClusterGrouping.java | 3 ++- .../upgrade/ConfigUpgradeChangeDefinition.java | 11 + .../stack/upgrade/ConfigurationCondition.java | 3 ++- .../server/state/stack/upgrade/Grouping.java | 3 ++- .../server/state/stack/upgrade/HostOrderItem.java | 3 ++- .../state/stack/upgrade/SecurityCondition.java | 3 ++- .../server/state/stack/upgrade/StageWrapper.java | 3 ++- .../server/state/stack/upgrade/TaskWrapper.java| 3 ++- .../internal/ClientConfigResourceProviderTest.java | 2 +- .../internal/StackDefinedPropertyProviderTest.java | 2 +- .../metrics/JMXPropertyProviderTest.java | 2 +- .../metrics/RestMetricsPropertyProviderTest.java | 2 +- .../server/view/persistence/DataStoreImplTest.java | 5 ++-- ambari-views/pom.xml | 2 +- ambari-web/package.json| 10 ambari-web/pom.xml | 2 +- .../fast-hdfs-resource/dependency-reduced-pom.xml | 2 +- contrib/fast-hdfs-resource/pom.xml | 2 +- contrib/views/hive-next/pom.xml| 6 ++--- contrib/views/hive20/pom.xml | 6 ++--- .../view/hive20/resources/browser/DDLProxy.java| 1 + contrib/views/jobs/pom.xml | 2 +- contrib/views/pig/pom.xml | 2 +- contrib/views/slider/pom.xml | 2 +- contrib/views/storm/pom.xml| 2 +- contrib/views/wfmanager/pom.xml| 2 +- .../views/wfmanager/src/main/resources/ui/pom.xml | 2 +- pom.xml| 17 +++-- utility/pom.xml| 5 ++-- 55 files changed, 150 insertions(+), 125 deletions(-)
[ambari] branch branch-2.7 updated: AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL; whereas url is actually accessible with credentials supplied by Releng team (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk 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 15939ef AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL;
whereas url is actually accessible with credentials supplied by Releng team
(aonishuk)
15939ef is described below
commit 15939ef421ace98996d46504a1cd68a000a15f7a
Author: Andrew Onishuk
AuthorDate: Mon Dec 9 17:54:24 2019 +0200
AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL; whereas url is
actually accessible with credentials supplied by Releng team (aonishuk)
---
.../ambari/server/controller/internal/RepositoryResourceProvider.java| 1 -
1 file changed, 1 deletion(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
index bba9331..82f7903 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
@@ -44,7 +44,6 @@ import
org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.utils.URLCredentialsHider;
import org.apache.commons.lang.BooleanUtils;
public class RepositoryResourceProvider extends
AbstractControllerResourceProvider {
[ambari] branch branch-2.7 updated: AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL; whereas url is actually accessible with credentials supplied by Releng team (aonishuk)
This is an automated email from the ASF dual-hosted git repository. aonishuk 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 9d4dec9 AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL; whereas url is actually accessible with credentials supplied by Releng team (aonishuk) 9d4dec9 is described below commit 9d4dec96387b863dfae1aaa8724db8c4f350d73f Author: Andrew Onishuk AuthorDate: Mon Dec 9 15:23:48 2019 +0200 AMBARI-25444. Deploy fails with 401:Unauthorized on HDP-GPL; whereas url is actually accessible with credentials supplied by Releng team (aonishuk) --- .../ambari/server/controller/internal/RepositoryResourceProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java index b844495..bba9331 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java @@ -179,11 +179,11 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid setResourceProperty(resource, REPOSITORY_REPO_NAME_PROPERTY_ID, response.getRepoName(), requestedIds); setResourceProperty(resource, REPOSITORY_DISTRIBUTION_PROPERTY_ID, response.getDistribution(), requestedIds); setResourceProperty(resource, REPOSITORY_COMPONENTS_PROPERTY_ID, response.getComponents(), requestedIds); -setResourceProperty(resource, REPOSITORY_BASE_URL_PROPERTY_ID, URLCredentialsHider.hideCredentials(response.getBaseUrl()), requestedIds); +setResourceProperty(resource, REPOSITORY_BASE_URL_PROPERTY_ID, response.getBaseUrl(), requestedIds); setResourceProperty(resource, REPOSITORY_OS_TYPE_PROPERTY_ID, response.getOsType(), requestedIds); setResourceProperty(resource, REPOSITORY_REPO_ID_PROPERTY_ID, response.getRepoId(), requestedIds); setResourceProperty(resource, REPOSITORY_MIRRORS_LIST_PROPERTY_ID, response.getMirrorsList(), requestedIds); -setResourceProperty(resource, REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID, URLCredentialsHider.hideCredentials(response.getDefaultBaseUrl()), requestedIds); +setResourceProperty(resource, REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID, response.getDefaultBaseUrl(), requestedIds); setResourceProperty(resource, REPOSITORY_UNIQUE_PROPERTY_ID, response.isUnique(), requestedIds); setResourceProperty(resource, REPOSITORY_TAGS_PROPERTY_ID, response.getTags(), requestedIds); setResourceProperty(resource, REPOSITORY_APPLICABLE_SERVICES_PROPERTY_ID, response.getApplicableServices(), requestedIds);
