This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch revert-3041-AMBARI-25311-branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 04a63dbf75089db019e148ec2f1ad64deda00d7c
Author: Dmytro Grinenko <hapy.les...@gmail.com>
AuthorDate: Mon Jul 15 12:10:20 2019 +0300
Revert "[AMBARI-25311] FinalizeKerberosServerAction timeout has to be
configu…"
---
ambari-metrics/pom.xml | 2 +-
ambari-server/docs/configuration/index.md | 12 +++++-------
.../ambari/server/configuration/Configuration.java | 17 -----------------
.../ambari/server/controller/KerberosHelperImpl.java | 4 ++--
4 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 25bca70..38da76a 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -74,7 +74,7 @@
<repository>
<id>apache-hadoop</id>
<name>hdp</name>
- <url>https://repository.apache.org/content/repositories/releases/</url>
+
<url>https://nexus-private.hortonworks.com/nexus/content/groups/public</url>
</repository>
<repository>
<id>apache-snapshots</id>
diff --git a/ambari-server/docs/configuration/index.md
b/ambari-server/docs/configuration/index.md
index 86e8ecd..a0c2d04 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -225,19 +225,18 @@ The following are the properties which can be used to
configure Ambari.
| server.jdbc.rca.user.passwd | The password for the user when connecting to
the database which stores RCA information. |`mapred` |
| server.jdbc.user.name | The user name used to login to the database.
|`ambari` |
| server.jdbc.user.passwd | The password for the user when logging into the
database. |`bigdata` |
-| server.kerberos.finalize.timeout | The timeout, in seconds, when finalizing
Kerberos enable/disable/regenerate commands. |`600` |
| server.locks.profiling | Enable the profiling of internal locks. |`false` |
| server.metrics.retrieval-service.thread.priority | The priority of threads
used by the service which retrieves JMX and REST metrics directly from their
respective endpoints. |`5` |
-| server.metrics.retrieval-service.threadpool.size.core | The core number of
threads used to retrieve JMX and REST metrics directly from their respective
endpoints. |`4` |
-| server.metrics.retrieval-service.threadpool.size.max | The maximum number of
threads used to retrieve JMX and REST metrics directly from their respective
endpoints. |`8` |
-| server.metrics.retrieval-service.threadpool.worker.size | The number of
queued requests allowed for JMX and REST metrics before discarding old requests
which have not been fullfilled. |`80` |
+| server.metrics.retrieval-service.threadpool.size.core | The core number of
threads used to retrieve JMX and REST metrics directly from their respective
endpoints. |`16` |
+| server.metrics.retrieval-service.threadpool.size.max | The maximum number of
threads used to retrieve JMX and REST metrics directly from their respective
endpoints. |`32` |
+| server.metrics.retrieval-service.threadpool.worker.size | The number of
queued requests allowed for JMX and REST metrics before discarding old requests
which have not been fullfilled. |`320` |
| server.operations.retry-attempts | The number of retry attempts for failed
API and blueprint operations. |`0` |
| server.os_family | The operating system family for all hosts in the cluster.
This is used when bootstrapping agents and when enabling Kerberos.<br/><br/>The
following are examples of valid values:<ul><li>`redhat`<li>`ubuntu`</ul> | |
| server.os_type | The operating system version for all hosts in the cluster.
This is used when bootstrapping agents and when enabling Kerberos.<br/><br/>The
following are examples of valid values:<ul><li>`6`<li>`7`</ul> | |
| server.persistence.type | The type of database connection being used. Unless
using an embedded PostgresSQL server, then this should be
`remote`.<br/><br/>The following are examples of valid
values:<ul><li>`local`<li>`remote`</ul> |`local` |
| server.property-provider.threadpool.completion.timeout | The maximum time,
in milliseconds, that federated requests for data can execute before being
terminated. Increasing this value could result in degraded performanc from the
REST APIs. |`5000` |
-| server.property-provider.threadpool.size.core | The core number of threads
that will be used to retrieve data from federated datasources, such as remote
JMX endpoints. |`4` |
-| server.property-provider.threadpool.size.max | The maximum number of threads
that will be used to retrieve data from federated datasources, such as remote
JMX endpoints. |`8` |
+| server.property-provider.threadpool.size.core | The core number of threads
that will be used to retrieve data from federated datasources, such as remote
JMX endpoints. |`16` |
+| server.property-provider.threadpool.size.max | The maximum number of threads
that will be used to retrieve data from federated datasources, such as remote
JMX endpoints. |`32` |
| server.property-provider.threadpool.worker.size | The maximum size of
pending federated datasource requests, such as those to JMX endpoints, which
can be queued before rejecting new requests. |`2147483647` |
| server.requestlogs.namepattern | The pattern of request log file name
|`ambari-access-yyyy_mm_dd.log` |
| server.requestlogs.path | The location on the Ambari Server where request
logs can be created. | |
@@ -290,7 +289,6 @@ The following are the properties which can be used to
configure Ambari.
| view.extraction.threadpool.timeout | The time, in milliseconds, that
non-core threads will live when extraction views on Ambari Server startup.
|`100000` |
| view.request.threadpool.size.max | The maximum number of threads which will
be allocated to handling REST API requests from embedded views. This value
should be smaller than `agent.threadpool.size.max`<br/><br/> This property is
related to `agent.threadpool.size.max`. |`0` |
| view.request.threadpool.timeout | The time, milliseconds, that REST API
requests from embedded views can wait if there are no threads available to
service the view's request. Setting this too low can cause views to timeout.
|`2000` |
-| views.additional.classpath | Additional class path added to each Ambari
View. Comma separated jars or directories | |
| views.ambari.request.connect.timeout.millis | The amount of time, in
milliseconds, that a view will wait when trying to connect on HTTP(S)
operations to the Ambari REST API. |`30000` |
| views.ambari.request.read.timeout.millis | The amount of time, in
milliseconds, that a view will wait before terminating an HTTP(S) read request
to the Ambari REST API. |`45000` |
| views.dir | The directory on the Ambari Server file system used for
expanding Views and storing webapp work.
|`/var/lib/ambari-server/resources/views` |
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 6b0e383..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
@@ -2609,13 +2609,6 @@ public class Configuration {
public static final ConfigurationProperty<Integer>
DEFAULT_MAX_DEGREE_OF_PARALLELISM_FOR_UPGRADES = new ConfigurationProperty<>(
"stack.upgrade.default.parallelism", 100);
- /**
- * 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<Integer>
KERBEROS_SERVER_ACTION_FINALIZE_SECONDS = new ConfigurationProperty<>(
- "server.kerberos.finalize.timeout", 600);
-
private static final Logger LOG = LoggerFactory.getLogger(
Configuration.class);
@@ -5569,16 +5562,6 @@ public class Configuration {
}
/**
- * 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:
* <ul>
* <li>Property key name</li>
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 00b74e0..94f5994 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
@@ -3719,7 +3719,7 @@ public class KerberosHelperImpl implements KerberosHelper
{
if (dataDirectory != null) {
commandParameters.put(KerberosServerAction.DATA_DIRECTORY,
dataDirectory.getAbsolutePath());
}
- int timeout = configuration.getKerberosServerActionFinalizeTimeout();
+
Stage stage =
createServerActionStage(requestStageContainer.getLastStageId(),
cluster,
requestStageContainer.getId(),
@@ -3729,7 +3729,7 @@ public class KerberosHelperImpl implements KerberosHelper
{
FinalizeKerberosServerAction.class,
event,
commandParameters,
- "Finalize Operations", timeout);
+ "Finalize Operations", 300);
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
