[ambari] branch branch-2.7 updated: AMBARI-25288 [views][Filesview] Copy File Operation in Filesview is overwriting the file (asnaik) (#2989)
This is an automated email from the ASF dual-hosted git repository.
asnaik 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 182304c AMBARI-25288 [views][Filesview] Copy File Operation in
Filesview is overwriting the file (asnaik) (#2989)
182304c is described below
commit 182304c6b481cc8a88d27e2aae658108195fa745
Author: Akhil S Naik
AuthorDate: Fri May 31 08:48:36 2019 +0530
AMBARI-25288 [views][Filesview] Copy File Operation in Filesview is
overwriting the file (asnaik) (#2989)
---
.../utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
index 1f8b584..20a66cf 100644
---
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
+++
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
@@ -463,7 +463,7 @@ public class HdfsApi {
public void copy(final String src, final String dest) throws IOException,
InterruptedException, HdfsApiException {
boolean result = execute(new PrivilegedExceptionAction() {
public Boolean run() throws Exception {
-return FileUtil.copy(fs, new Path(src), fs, new Path(dest), false,
conf);
+return FileUtil.copy(fs, new Path(src), fs, new Path(dest),
false,false, conf);
}
});
[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());
-
[ambari] branch trunk updated: [AMBARI-25240] : Dynamically update Rolling Upgrade Batch size (#2926)
This is an automated email from the ASF dual-hosted git repository.
amagyar 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 91f80c3 [AMBARI-25240] : Dynamically update Rolling Upgrade Batch
size (#2926)
91f80c3 is described below
commit 91f80c3bce37d78dee64142544b2ab1ea5962bfb
Author: virajjasani <34790606+virajjas...@users.noreply.github.com>
AuthorDate: Thu May 30 15:16:03 2019 +0530
[AMBARI-25240] : Dynamically update Rolling Upgrade Batch size (#2926)
* [AMBARI-25240] : Dynamically update Rolling Upgrade Batch size using
cluster env property
* minor code style fix
---
.../org/apache/ambari/server/stack/MasterHostResolver.java| 11 +++
.../server/stack/upgrade/orchestrate/StageWrapperBuilder.java | 7 +++
2 files changed, 18 insertions(+)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
index ed90eed..449c507 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
@@ -319,6 +319,17 @@ public class MasterHostResolver {
}
/**
+ * Find Config value for current Cluster using configType and propertyName
+ *
+ * @param configType Config Type
+ * @param propertyName Property Name
+ * @return Value of property if present else null
+ */
+ public String getValueFromDesiredConfigurations(final String configType,
final String propertyName) {
+return m_configHelper.getValueFromDesiredConfigurations(m_cluster,
configType, propertyName);
+ }
+
+ /**
* Find the master and secondary namenode(s) based on JMX NameNodeStatus.
*/
private HostsType.HighAvailabilityHosts findMasterAndSecondaries(NameService
nameService, Set componentHosts) throws ClassifyNameNodeException {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
index d7e9b50..c3d586c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/StageWrapperBuilder.java
@@ -31,7 +31,9 @@ import
org.apache.ambari.server.stack.upgrade.ServerActionTask;
import org.apache.ambari.server.stack.upgrade.ServiceCheckGrouping;
import org.apache.ambari.server.stack.upgrade.Task;
import org.apache.ambari.server.stack.upgrade.UpgradePack.ProcessingComponent;
+import org.apache.ambari.server.state.ConfigHelper;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Defines how to build stages for an Upgrade or Downgrade.
@@ -279,6 +281,11 @@ public abstract class StageWrapperBuilder {
if (m_grouping.parallelScheduler != null) {
int taskParallelism =
m_grouping.parallelScheduler.maxDegreeOfParallelism;
+ String maxDegreeFromClusterEnv =
+
ctx.getResolver().getValueFromDesiredConfigurations(ConfigHelper.CLUSTER_ENV,
"max_degree_parallelism");
+ if (StringUtils.isNotEmpty(maxDegreeFromClusterEnv) &&
StringUtils.isNumeric(maxDegreeFromClusterEnv)) {
+taskParallelism = Integer.parseInt(maxDegreeFromClusterEnv);
+ }
if (taskParallelism ==
ParallelScheduler.DEFAULT_MAX_DEGREE_OF_PARALLELISM) {
taskParallelism = ctx.getDefaultMaxDegreeOfParallelism();
}
[ambari] branch branch-2.7 updated: [AMBARI-25240] : Dynamically update Rolling Upgrade Batch size (#2927)
This is an automated email from the ASF dual-hosted git repository.
amagyar 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 296a137 [AMBARI-25240] : Dynamically update Rolling Upgrade Batch
size (#2927)
296a137 is described below
commit 296a13713d757a555a79e1cb597d0a9461d40037
Author: virajjasani <34790606+virajjas...@users.noreply.github.com>
AuthorDate: Thu May 30 15:16:37 2019 +0530
[AMBARI-25240] : Dynamically update Rolling Upgrade Batch size (#2927)
* [AMBARI-25240] : Dynamically update Rolling Upgrade Batch size
* minor code change
---
.../org/apache/ambari/server/stack/MasterHostResolver.java| 11 +++
.../apache/ambari/server/state/stack/upgrade/Grouping.java| 9 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
index b018277..372c250 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
@@ -313,6 +313,17 @@ public class MasterHostResolver {
}
/**
+ * Find Config value for current Cluster using configType and propertyName
+ *
+ * @param configType Config Type
+ * @param propertyName Property Name
+ * @return Value of property if present else null
+ */
+ public String getValueFromDesiredConfigurations(final String configType,
final String propertyName) {
+return m_configHelper.getValueFromDesiredConfigurations(m_cluster,
configType, propertyName);
+ }
+
+ /**
* Find the master and secondary namenode(s) based on JMX NameNodeStatus.
*/
private HostsType.HighAvailabilityHosts findMasterAndSecondaries(NameService
nameService, Set componentHosts) throws ClassifyNameNodeException {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java
index 150c9fa..5f667ba 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java
@@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.stack.HostsType;
+import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.UpgradeContext;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.UpgradePack.OrderService;
@@ -224,10 +225,14 @@ public class Grouping {
// Expand some of the TaskWrappers into multiple based on the batch size.
for (TaskWrapper tw : tasks) {
-List> hostSets = null;
-
+List> hostSets;
if (m_grouping.parallelScheduler != null) {
int taskParallelism =
m_grouping.parallelScheduler.maxDegreeOfParallelism;
+ String maxDegreeFromClusterEnv = ctx.getResolver()
+ .getValueFromDesiredConfigurations(ConfigHelper.CLUSTER_ENV,
"max_degree_parallelism");
+ if (StringUtils.isNotEmpty(maxDegreeFromClusterEnv) &&
StringUtils.isNumeric(maxDegreeFromClusterEnv)) {
+taskParallelism = Integer.parseInt(maxDegreeFromClusterEnv);
+ }
if (taskParallelism == Integer.MAX_VALUE) {
taskParallelism = ctx.getDefaultMaxDegreeOfParallelism();
}
[ambari] branch branch-2.7 updated: AMBARI-25278 display all .count type Kafka metrics as rates in Grafana (#2982)
This is an automated email from the ASF dual-hosted git repository.
benyoka 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 7484e79 AMBARI-25278 display all .count type Kafka metrics as rates
in Grafana (#2982)
7484e79 is described below
commit 7484e7912b34d41b339789609ea1ac5ebf1c2b36
Author: benyoka
AuthorDate: Thu May 30 11:48:02 2019 +0200
AMBARI-25278 display all .count type Kafka metrics as rates in Grafana
(#2982)
---
.../grafana-dashboards/HDF/grafana-kafka-home.json | 18 +-
.../grafana-dashboards/HDF/grafana-kafka-hosts.json | 14 +++---
.../grafana-dashboards/HDF/grafana-kafka-topics.json | 20 ++--
.../grafana-dashboards/HDP/grafana-kafka-home.json | 18 +-
.../grafana-dashboards/HDP/grafana-kafka-hosts.json | 14 +++---
.../grafana-dashboards/HDP/grafana-kafka-topics.json | 20 ++--
6 files changed, 52 insertions(+), 52 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-home.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-home.json
index 5ec4404..983142a 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-home.json
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-home.json
@@ -89,7 +89,7 @@
"metric": "kafka.server.BrokerTopicMetrics.BytesInPerSec.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
},
{
@@ -101,7 +101,7 @@
"metric": "kafka.server.BrokerTopicMetrics.BytesOutPerSec.count",
"precision": "default",
"refId": "B",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -172,7 +172,7 @@
"metric":
"kafka.server.BrokerTopicMetrics.MessagesInPerSec.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -558,7 +558,7 @@
"metric":
"kafka.network.RequestMetrics.RequestsPerSec.request.Produce.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -629,7 +629,7 @@
"metric":
"kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -709,7 +709,7 @@
"metric":
"kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "rate"
}
],
@@ -780,7 +780,7 @@
"metric":
"kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -860,7 +860,7 @@
"metric": "kafka.server.ReplicaManager.IsrShrinksPerSec.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
@@ -932,7 +932,7 @@
"metric": "kafka.server.ReplicaManager.IsrExpandsPerSec.count",
"precision": "default",
"refId": "A",
- "transform": "none",
+ "transform": "rate",
"transformData": "none"
}
],
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-hosts.json
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-hosts.json
index 533a169..f1e5d91 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDF/grafana-kafka-hosts.json
+++
[ambari] branch trunk updated: AMBARI-25291: Set dfs.namenode.kerberos.principal.pattern in OneFS Mpack. (#2993)
This is an automated email from the ASF dual-hosted git repository.
amagyar 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 c89bb07 AMBARI-25291: Set dfs.namenode.kerberos.principal.pattern in
OneFS Mpack. (#2993)
c89bb07 is described below
commit c89bb07059e6e8704ade78018c6dae472020f5b7
Author: Kait Johnson
AuthorDate: Thu May 30 00:57:42 2019 -0700
AMBARI-25291: Set dfs.namenode.kerberos.principal.pattern in OneFS Mpack.
(#2993)
---
.../src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
index f706665..2e8b3d4 100644
---
a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
+++
b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
@@ -28,7 +28,8 @@
"hadoop.security.authorization": "true",
"hadoop.proxyuser.HTTP.groups": "${hadoop-env/proxyuser_group}",
"hadoop.security.token.service.use_ip" : "false",
-"dfs.namenode.kerberos.principal":
"${hadoop-env/hdfs_user}/${onefs/onefs_host}@${realm}"
+"dfs.namenode.kerberos.principal":
"${hadoop-env/hdfs_user}/${onefs/onefs_host}@${realm}",
+"dfs.namenode.kerberos.principal.pattern": "*"
}
},
{
[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)));
+
