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 <dmitriu...@apache.org>
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 @@
<exclude>src/test/resources/mpacks_replay.log</exclude>
<exclude>src/test/python/stacks/2.5/HIVE/*.txt</exclude>
<exclude>src/test/python/mpacks/mystack-ambari-mpack-1.0.0.1/stacks/MYSTACK/3.0/services/SERVICEC/dashboards/service-metrics/STORM.txt</exclude>
+
<exclude>src/test/python/uninstall/dashboards/files/metainfo.xml</exclude>
<!--exclude symlink-->
+
<exclude>src/test/python/uninstall/dashboards/files/STORM.txt</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/dashboards/SERVICEB</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/dashboards/SERVICEA</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/extensions/SERVICEB</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/extensions/SERVICEA</exclude>
<!--exclude symlink-->
+
<exclude>src/test/python/uninstall/common-services/SERVICEB</exclude>
<!--exclude symlink-->
+
<exclude>src/test/python/uninstall/common-services/SERVICEA</exclude>
<!--exclude symlink-->
+
<exclude>src/test/python/uninstall/stacks/2.0/files/metainfo1.xml</exclude>
<!--exclude symlink-->
+
<exclude>src/test/python/uninstall/stacks/2.0/files/metainfo2.xml</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/stacks/2.0/SERVICEB</exclude>
<!--exclude symlink-->
+ <exclude>src/test/python/uninstall/stacks/2.0/SERVICEA</exclude>
<!--exclude symlink-->
<exclude>src/test/python/uninstall/dashboards/files/STORM.txt</exclude>
<exclude>src/main/resources/hive-schema-0.10.0.oracle.sql</exclude>
<exclude>src/main/resources/hive-schema-0.12.0.oracle.sql</exclude>
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index 74fcc61..1d17ff2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -274,10 +274,10 @@ public class HeartbeatProcessor extends AbstractService{
Long clusterId = null;
if (CollectionUtils.isNotEmpty(componentStatuses)) {
calculateHostStatus = true;
- for (ComponentStatus componentStatus : componentStatuses) {
- clusterId = componentStatus.getClusterId();
- break;
- }
+ clusterId = componentStatuses.stream()
+ .findFirst()
+ .map(ComponentStatus::getClusterId)
+ .orElse(null);
}
if (!calculateHostStatus && CollectionUtils.isNotEmpty(reports)) {
@@ -391,15 +391,13 @@ public class HeartbeatProcessor extends AbstractService{
}
if (writeKeytabsStructuredOut != null) {
- if (SET_KEYTAB.equalsIgnoreCase(customCommand)) {
- Map<String, String> keytabs =
writeKeytabsStructuredOut.getKeytabs();
- if (keytabs != null) {
- for (Map.Entry<String, String> entry : keytabs.entrySet()) {
- String keytabPath = entry.getValue();
- for (KerberosKeytabPrincipalEntity kkpe:
kerberosKeytabPrincipalDAO.findByHostAndKeytab(host.getHostId(), keytabPath)) {
- kkpe.setDistributed(true);
- kerberosKeytabPrincipalDAO.merge(kkpe);
- }
+ Map<String, String> keytabs =
writeKeytabsStructuredOut.getKeytabs();
+ if (keytabs != null) {
+ for (Map.Entry<String, String> entry : keytabs.entrySet()) {
+ String keytabPath = entry.getValue();
+ for (KerberosKeytabPrincipalEntity kkpe :
kerberosKeytabPrincipalDAO.findByHostAndKeytab(host.getHostId(), keytabPath)) {
+ kkpe.setDistributed(true);
+ kerberosKeytabPrincipalDAO.merge(kkpe);
}
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
index 308ec84..14b5877 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
@@ -152,15 +152,13 @@ public class AlertDefinitionsHolder extends
AgentHostDataHolder<AlertDefinitions
LOG.debug("Handled {} of alerts for {} cluster(s) on host with id {},
changed = {}", update.getEventType(), updateClusters.size(), hostId, changed);
break;
case CREATE:
- if (!updateClusters.isEmpty()) {
- if (!Sets.intersection(existingClusters.keySet(),
updateClusters.keySet()).isEmpty()) {
- throw new AmbariException("Existing clusters in create");
- }
- mergedClusters.putAll(existingClusters);
- mergedClusters.putAll(updateClusters);
- LOG.debug("Handled {} of alerts for {} cluster(s)",
update.getEventType(), updateClusters.size());
- changed = true;
+ if (!Sets.intersection(existingClusters.keySet(),
updateClusters.keySet()).isEmpty()) {
+ throw new AmbariException("Existing clusters in create");
}
+ mergedClusters.putAll(existingClusters);
+ mergedClusters.putAll(updateClusters);
+ LOG.debug("Handled {} of alerts for {} cluster(s)",
update.getEventType(), updateClusters.size());
+ changed = true;
break;
default:
LOG.warn("Unhandled event type {}", update.getEventType());
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java
index b52e876..ca72b04 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.Resource.Type;
/**
* An extension version is like a stack version but it contains custom
services. Linking an extension
@@ -31,10 +30,6 @@ import org.apache.ambari.server.controller.spi.Resource.Type;
*/
public class ExtensionLinkResourceDefinition extends BaseResourceDefinition {
- public ExtensionLinkResourceDefinition(Type resourceType) {
- super(Resource.Type.ExtensionLink);
- }
-
public ExtensionLinkResourceDefinition() {
super(Resource.Type.ExtensionLink);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java
index ae2762a..c15b5ad 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.Resource.Type;
/**
* An extension version is like a stack version but it contains custom
services. Linking an extension
@@ -31,10 +30,6 @@ import org.apache.ambari.server.controller.spi.Resource.Type;
*/
public class ExtensionResourceDefinition extends BaseResourceDefinition {
- public ExtensionResourceDefinition(Type resourceType) {
- super(Resource.Type.Extension);
- }
-
public ExtensionResourceDefinition() {
super(Resource.Type.Extension);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/MpackResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/MpackResourceDefinition.java
index 3875135..10e8351 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/MpackResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/MpackResourceDefinition.java
@@ -27,7 +27,6 @@ import org.apache.ambari.server.api.services.Request;
import org.apache.ambari.server.api.util.TreeNode;
import org.apache.ambari.server.controller.internal.ResourceImpl;
import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.Resource.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,10 +39,6 @@ public class MpackResourceDefinition extends
BaseResourceDefinition {
private final static Logger LOG =
LoggerFactory.getLogger(MpackResourceDefinition.class);
- public MpackResourceDefinition(Type resourceType) {
- super(Resource.Type.Mpack);
- }
-
public MpackResourceDefinition() {
super(Resource.Type.Mpack);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java
index cdea7da..0b75dad 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java
@@ -22,14 +22,9 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.Resource.Type;
public class StackResourceDefinition extends BaseResourceDefinition {
- public StackResourceDefinition(Type resourceType) {
- super(Resource.Type.Stack);
- }
-
public StackResourceDefinition() {
super(Resource.Type.Stack);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/PluginChecksLoadedCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/PluginChecksLoadedCheck.java
index 5538919..c342088 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/PluginChecksLoadedCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/PluginChecksLoadedCheck.java
@@ -84,16 +84,13 @@ public class PluginChecksLoadedCheck extends ClusterCheck {
.map(FailedPluginClassDetail::new)
.collect(Collectors.toSet());
- // check for failure
- if (failedPluginClasses.size() > 0) {
- result.setStatus(UpgradeCheckStatus.WARNING);
- result.getFailedDetail().addAll(failedPluginSimpleClasses);
- result.setFailReason(getFailReason(result, request));
-
- result.getFailedOn().addAll(failedPluginSimpleClasses.stream()
- .map(detail -> detail.toSimpleString())
- .collect(Collectors.toSet()));
- }
+ result.setStatus(UpgradeCheckStatus.WARNING);
+ result.getFailedDetail().addAll(failedPluginSimpleClasses);
+ result.setFailReason(getFailReason(result, request));
+
+ result.getFailedOn().addAll(failedPluginSimpleClasses.stream()
+ .map(detail -> detail.toSimpleString())
+ .collect(Collectors.toSet()));
return result;
}
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 45496c5..a7e078d 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
@@ -3942,7 +3942,7 @@ public class Configuration {
if (dbpasswd != null) {
return dbpasswd;
- } else if (dbpasswd == null && isPasswordAlias) {
+ } else if (isPasswordAlias) {
LOG.error("Can't read db password from keystore. Please, check master
key was set correctly.");
throw new RuntimeException("Can't read db password from keystore.
Please, check master key was set correctly.");
} else {
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 72454a2..42176d1 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
@@ -3384,11 +3384,9 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
hostParamsCmd.putAll(ec.getHostLevelParams());
ec.getHostLevelParams().putAll(hostParamsCmd);
- if (null != cluster) {
- // Generate localComponents
- for (ServiceComponentHost sch :
cluster.getServiceComponentHosts(scHost.getHostName())) {
- ec.getLocalComponents().add(sch.getServiceComponentName());
- }
+ // Generate localComponents
+ for (ServiceComponentHost sch :
cluster.getServiceComponentHosts(scHost.getHostName())) {
+ ec.getLocalComponents().add(sch.getServiceComponentName());
}
return ec;
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 4f4763a..064c05d 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
@@ -2956,17 +2956,15 @@ public class KerberosHelperImpl implements
KerberosHelper {
if (configurations.get(CLUSTER_HOST_INFO) == null) {
Map<String, Set<String>> clusterHostInfo =
StageUtils.getClusterHostInfo(cluster);
- if (clusterHostInfo != null) {
- Map<String, String> componentHosts = new HashMap<>();
+ Map<String, String> componentHosts = new HashMap<>();
- clusterHostInfo = StageUtils.substituteHostIndexes(clusterHostInfo);
+ clusterHostInfo = StageUtils.substituteHostIndexes(clusterHostInfo);
- for (Map.Entry<String, Set<String>> entry :
clusterHostInfo.entrySet()) {
- componentHosts.put(entry.getKey(),
StringUtils.join(entry.getValue(), ","));
- }
-
- configurations.put(CLUSTER_HOST_INFO, componentHosts);
+ for (Map.Entry<String, Set<String>> entry : clusterHostInfo.entrySet()) {
+ componentHosts.put(entry.getKey(), StringUtils.join(entry.getValue(),
","));
}
+
+ configurations.put(CLUSTER_HOST_INFO, componentHosts);
}
configurations.put("principals", principalNames(cluster, configurations));
return configurations;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceRequest.java
index fe72a33..9793fc3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceRequest.java
@@ -26,15 +26,17 @@ public class StackServiceRequest extends
StackVersionRequest {
private String credentialStoreEnabled;
public StackServiceRequest(String stackName, String stackVersion,
- String serviceName) {
+ String serviceName) {
this(stackName, stackVersion, serviceName, null, null);
}
public StackServiceRequest(String stackName, String stackVersion,
- String serviceName, String credentialStoreSupported, String
credentialStoreEnabled) {
+ String serviceName, String
credentialStoreSupported, String credentialStoreEnabled) {
super(stackName, stackVersion);
this.setServiceName(serviceName);
+ this.setCredentialStoreSupported(credentialStoreSupported);
+ this.setCredentialStoreEnabled(credentialStoreEnabled);
}
public String getServiceName() {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
index 72fe0ae..206986c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
@@ -198,7 +198,7 @@ public class AlertResourceProvider extends
ReadOnlyResourceProvider implements
} else {
// Verify authorization to retrieve the requested data
try {
- Long clusterId = (StringUtils.isEmpty(clusterName)) ? null :
getClusterId(clusterName);
+ Long clusterId = getClusterId(clusterName);
String definitionName = (String)
propertyMap.get(ALERT_DEFINITION_NAME);
String definitionId = (String) propertyMap.get(ALERT_DEFINITION_ID);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerLDAPConfigurationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerLDAPConfigurationHandler.java
index 7f1a49f..a3c2d1f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerLDAPConfigurationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerLDAPConfigurationHandler.java
@@ -101,9 +101,6 @@ public class AmbariServerLDAPConfigurationHandler extends
AmbariServerStackAdvis
OperationType operationType;
try {
operationType = OperationType.translate(operation);
- if (operationType == null) {
- throw new SystemException(String.format("The requested operation is
not supported for this category: %s", categoryName));
- }
} catch (IllegalArgumentException e) {
throw new SystemException(String.format("The requested operation is not
supported for this category: %s", categoryName), e);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerStackAdvisorAwareConfigurationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerStackAdvisorAwareConfigurationHandler.java
index 49d5ec9..78e7301 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerStackAdvisorAwareConfigurationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerStackAdvisorAwareConfigurationHandler.java
@@ -19,7 +19,6 @@
package org.apache.ambari.server.controller.internal;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -195,10 +194,6 @@ class AmbariServerStackAdvisorAwareConfigurationHandler
extends AmbariServerConf
String configType = configuration.getKey();
Map<String, String> configurationProperties = new
HashMap<>(configuration.getValue());
- if (configurationProperties == null) {
- configurationProperties = Collections.emptySortedMap();
- }
-
properties.put("properties", configurationProperties);
requestConfigurations.put(configType, properties);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 12ef314..56c0405 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -292,8 +292,6 @@ public class BlueprintConfigurationProcessor {
oozieEnvUpdaters.put("oozie_existing_mysql_host", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
oozieEnvUpdaters.put("oozie_existing_oracle_host", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
oozieEnvUpdaters.put("oozie_existing_postgresql_host", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
- oozieEnvUpdaters.put("oozie_existing_oracle_host", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
- oozieEnvUpdaters.put("oozie_existing_postgresql_host", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
oozieSiteUpdaters.put("oozie.service.JPAService.jdbc.url", new
SingleHostTopologyUpdater("OOZIE_SERVER"));
singleHostTopologyUpdaters.put("oozie-env", oozieEnvUpdaters);
@@ -305,8 +303,6 @@ public class BlueprintConfigurationProcessor {
oozieEnvOriginalValueMap.put("oozie_existing_mysql_host", new
OriginalValuePropertyUpdater());
oozieEnvOriginalValueMap.put("oozie_existing_oracle_host", new
OriginalValuePropertyUpdater());
oozieEnvOriginalValueMap.put("oozie_existing_postgresql_host", new
OriginalValuePropertyUpdater());
- oozieEnvOriginalValueMap.put("oozie_existing_oracle_host", new
OriginalValuePropertyUpdater());
- oozieEnvOriginalValueMap.put("oozie_existing_postgresql_host", new
OriginalValuePropertyUpdater());
oozieSiteOriginalValueMap.put("oozie.service.JPAService.jdbc.url", new
OriginalValuePropertyUpdater());
removePropertyUpdaters.put("oozie-env", oozieEnvOriginalValueMap);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index d223e55..1edb665 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -76,7 +76,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
-import com.google.inject.Injector;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@@ -196,8 +195,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
* @param managementController the management controller
*/
@AssistedInject
- public HostComponentResourceProvider(@Assisted AmbariManagementController
managementController,
- Injector injector) {
+ public HostComponentResourceProvider(@Assisted AmbariManagementController
managementController) {
super(Resource.Type.HostComponent, propertyIds, keyPropertyIds,
managementController);
setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.SERVICE_ADD_DELETE_SERVICES,RoleAuthorization.HOST_ADD_DELETE_COMPONENTS));
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
index c318775..c57b150 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
@@ -711,9 +711,7 @@ public class RequestResourceProvider extends
AbstractControllerResourceProvider
// !!! this call will result in mixed results of cluster and
non-cluster. this
// will get fixed in a future iteration, as the host_role_command
table does not
// currently have direct cluster affinity, and changing that is a tad
destructive.
- requestIds = actionManager.getRequestsByStatus(status,
- maxResults != null ? maxResults : BaseRequest.DEFAULT_PAGE_SIZE,
- ascOrder != null ? ascOrder : false);
+ requestIds = actionManager.getRequestsByStatus(status, maxResults,
ascOrder);
}
LOG.debug("List<Long> requestIds = actionManager.getRequestsByStatus =
{}", requestIds.size());
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index 5685392..a5263c1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
@@ -496,12 +496,8 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
Collection<KerberosServiceDescriptor> serviceDescriptors =
getServiceDescriptors(stackInfo);
- if (serviceDescriptors != null) {
- serviceDescriptors.forEach(kerberosDescriptor::putService);
- return kerberosDescriptor.toMap();
- } else {
- return null;
- }
+ serviceDescriptors.forEach(kerberosDescriptor::putService);
+ return kerberosDescriptor.toMap();
}
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
index e2f0906..896abbe 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
@@ -303,15 +303,15 @@ public class RestMetricsPropertyProvider extends
ThreadPoolEnabledPropertyProvid
portPropertyName =
metricsProperties.get(portPropertyNameInMetricsProperties);
}
String portStr = getPropertyValueByNameAndConfigType(portPropertyName,
portConfigType, cluster, hostname);
- if (portStr == null &&
metricsProperties.containsKey(DEFAULT_PORT_PROPERTY)) {
+ if (portStr == null) {
if (metricsProperties.containsKey(DEFAULT_PORT_PROPERTY)) {
portStr = metricsProperties.get(DEFAULT_PORT_PROPERTY);
} else {
String message = String.format("Can not determine REST port for " +
- "component %s. " +
- "Default REST port property %s is not defined at metrics.json " +
- "file for service, and there is no any other available ways " +
- "to determine port information.",
+ "component %s. " +
+ "Default REST port property %s is not defined at metrics.json
" +
+ "file for service, and there is no any other available ways " +
+ "to determine port information.",
componentName, DEFAULT_PORT_PROPERTY);
throw new AmbariException(message);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaHostPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaHostPropertyProvider.java
index 7abf7a8..7ae2a7f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaHostPropertyProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaHostPropertyProvider.java
@@ -45,7 +45,6 @@ public class GangliaHostPropertyProvider extends
GangliaPropertyProvider {
GANGLIA_CLUSTER_NAMES.add("HDPResourceManager");
GANGLIA_CLUSTER_NAMES.add("HDPHBaseMaster");
GANGLIA_CLUSTER_NAMES.add("HDPHistoryServer");
- GANGLIA_CLUSTER_NAMES.add("HDPNameNode");
GANGLIA_CLUSTER_NAMES.add("HDPTaskTracker");
GANGLIA_CLUSTER_NAMES.add("HDPHBaseRegionServer");
GANGLIA_CLUSTER_NAMES.add("HDPFlumeServer");
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
index 02ea9f3..e709a8d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
@@ -73,9 +73,8 @@ public class GangliaReportPropertyProvider extends
MetricsReportPropertyProvider
Set<Resource> keepers = new HashSet<>();
for (Resource resource : resources) {
- if (populateResource(resource, request, predicate)) {
- keepers.add(resource);
- }
+ populateResource(resource, request, predicate);
+ keepers.add(resource);
}
return keepers;
}
@@ -90,17 +89,15 @@ public class GangliaReportPropertyProvider extends
MetricsReportPropertyProvider
* @param request the request
* @param predicate the predicate
*
- * @return true if the resource was successfully populated with the
requested properties
- *
* @throws SystemException if unable to populate the resource
*/
- private boolean populateResource(Resource resource, Request request,
Predicate predicate)
+ private void populateResource(Resource resource, Request request, Predicate
predicate)
throws SystemException {
Set<String> propertyIds = getPropertyIds();
if (propertyIds.isEmpty()) {
- return true;
+ return;
}
String clusterName = (String)
resource.getPropertyValue(clusterNamePropertyId);
@@ -109,12 +106,12 @@ public class GangliaReportPropertyProvider extends
MetricsReportPropertyProvider
LOG.warn("Attempting to get metrics but the Ganglia server is unknown.
Resource=" + resource +
" : Cluster=" + clusterName);
}
- return true;
+ return;
}
setProperties(resource, clusterName, request,
getRequestPropertyIds(request, predicate));
- return true;
+ return;
}
private boolean setProperties(Resource resource, String clusterName, Request
request, Set<String> ids)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
index 431f9ba..92bcfbd 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
@@ -102,9 +102,8 @@ public class AMSReportPropertyProvider extends
MetricsReportPropertyProvider {
Set<Resource> keepers = new HashSet<>();
for (Resource resource : resources) {
- if (populateResource(resource, request, predicate)) {
- keepers.add(resource);
- }
+ populateResource(resource, request, predicate);
+ keepers.add(resource);
}
return keepers;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
index 52ec0e7..0d6357e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
@@ -105,10 +105,10 @@ public final class HiveServiceCalculatedState extends
DefaultServiceCalculatedSt
if (nonStartedState == null ||
(hiveServerComponentStarted && webHcatComponentStarted &&
activeHiveMetastoreComponentCount > 0 &&
- (embeddedMysqlComponentExists ? mysqlComponentStarted : true))) {
+ (!embeddedMysqlComponentExists || mysqlComponentStarted))) {
return State.STARTED;
}
- return nonStartedState == null ? State.INSTALLED : nonStartedState;
+ return nonStartedState;
}
} catch (AmbariException e) {
LOG.error("Can't determine service state.", e);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
index dde2647..952bc2b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
@@ -89,7 +89,7 @@ public class ActionDefinitionManager {
|| !customActionDefinitionRoot.exists()
|| !customActionDefinitionRoot.canRead()) {
LOG.warn("Cannot read custom action definitions. " +
- customActionDefinitionRoot == null ? "" : "Check path " +
customActionDefinitionRoot.getAbsolutePath());
+ (customActionDefinitionRoot == null ? "" : ("Check path " +
customActionDefinitionRoot.getAbsolutePath())));
}
File[] customActionDefinitionFiles
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
index d6dd89b..71ce27c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
@@ -20,7 +20,6 @@ package org.apache.ambari.server.events.listeners.upgrade;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.RequestUpdateEvent;
import org.apache.ambari.server.events.UpgradeUpdateEvent;
-import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
import org.apache.ambari.server.orm.dao.RequestDAO;
@@ -47,7 +46,7 @@ public class UpgradeUpdateListener {
private RequestDAO requestDAO;
@Inject
- public UpgradeUpdateListener(STOMPUpdatePublisher STOMPUpdatePublisher,
AmbariEventPublisher ambariEventPublisher) {
+ public UpgradeUpdateListener(STOMPUpdatePublisher STOMPUpdatePublisher) {
STOMPUpdatePublisher.registerAPI(this);
this.STOMPUpdatePublisher = STOMPUpdatePublisher;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
index b13a432..42aa778 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
@@ -64,10 +64,8 @@ public class StompEventsMetricsSource extends
AbstractMetricsSource {
@Override
public void run() {
List<SingleMetric> events = getEvents();
- if (!events.isEmpty()) {
- sink.publish(events);
- LOG.debug("********* Published stomp events metrics to sink
**********");
- }
+ sink.publish(events);
+ LOG.debug("********* Published stomp events metrics to sink
**********");
}
}, interval, interval, TimeUnit.SECONDS);
} catch (Exception e) {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
index 3a0f0a0..2dfcaa5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
@@ -414,9 +414,7 @@ public class AlertScriptDispatcher implements
NotificationDispatcher {
try {
return process.exitValue();
} catch (IllegalThreadStateException ex) {
- if (timeRemaining > 0) {
- Thread.sleep(Math.min(timeRemaining, 500));
- }
+ Thread.sleep(Math.min(timeRemaining, 500));
}
long timeElapsed = System.currentTimeMillis() - startTime;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 4cc8032..328cce6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -1063,9 +1063,7 @@ public class DBAccessorImpl implements DBAccessor {
ScriptRunner scriptRunner = new ScriptRunner(getConnection(), false,
false);
scriptRunner.runScript(br);
} finally {
- if (br != null) {
- br.close();
- }
+ br.close();
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index ef63538..8e091da 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -395,7 +395,7 @@ public class RepositoryVersionEntity {
String leading = stackId.getStackVersion(); // E.g, 2.3
// In some cases during unit tests, the leading can contain 3 digits, so
only the major number (first two parts) are needed.
String[] leadingParts = leading.split("\\.");
- if (null != leadingParts && leadingParts.length > 2) {
+ if (leadingParts.length > 2) {
leading = leadingParts[0] + "." + leadingParts[1];
}
return version.startsWith(leading);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/ScriptRunner.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/ScriptRunner.java
index 7bfaa06..5b5ad91 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/ScriptRunner.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/ScriptRunner.java
@@ -143,9 +143,7 @@ public class ScriptRunner {
if (trimmedLine.startsWith("--")) {
println(trimmedLine);
} else if (trimmedLine.length() < 1
- || trimmedLine.startsWith("//")) {
- // Do nothing
- } else if (trimmedLine.length() < 1
+ || trimmedLine.startsWith("//")
|| trimmedLine.startsWith("--")) {
// Do nothing
} else if (!fullLineDelimiter
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java
index bcc65eb..5e34c2e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java
@@ -102,15 +102,13 @@ public class AmbariKerberosAuthenticationFilter extends
SpnegoAuthenticationProc
setFailureHandler(new AuthenticationFailureHandler() {
@Override
public void onAuthenticationFailure(HttpServletRequest
httpServletRequest, HttpServletResponse httpServletResponse,
AuthenticationException e) throws IOException, ServletException {
- if (eventHandler != null) {
- AmbariAuthenticationException cause;
- if (e instanceof AmbariAuthenticationException) {
- cause = (AmbariAuthenticationException) e;
- } else {
- cause = new AmbariAuthenticationException(null,
e.getLocalizedMessage(), false, e);
- }
-
eventHandler.onUnsuccessfulAuthentication(AmbariKerberosAuthenticationFilter.this,
httpServletRequest, httpServletResponse, cause);
+ AmbariAuthenticationException cause;
+ if (e instanceof AmbariAuthenticationException) {
+ cause = (AmbariAuthenticationException) e;
+ } else {
+ cause = new AmbariAuthenticationException(null,
e.getLocalizedMessage(), false, e);
}
+
eventHandler.onUnsuccessfulAuthentication(AmbariKerberosAuthenticationFilter.this,
httpServletRequest, httpServletResponse, cause);
entryPoint.commence(httpServletRequest, httpServletResponse, e);
}
@@ -119,9 +117,7 @@ public class AmbariKerberosAuthenticationFilter extends
SpnegoAuthenticationProc
setSuccessHandler(new AuthenticationSuccessHandler() {
@Override
public void onAuthenticationSuccess(HttpServletRequest
httpServletRequest, HttpServletResponse httpServletResponse, Authentication
authentication) throws IOException, ServletException {
- if (eventHandler != null) {
-
eventHandler.onSuccessfulAuthentication(AmbariKerberosAuthenticationFilter.this,
httpServletRequest, httpServletResponse, authentication);
- }
+
eventHandler.onSuccessfulAuthentication(AmbariKerberosAuthenticationFilter.this,
httpServletRequest, httpServletResponse, authentication);
}
});
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java
index 29b3e4f..a6f5967 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java
@@ -354,7 +354,6 @@ public class AmbariAuthorizationFilter implements Filter {
requestURI.matches(API_CLUSTER_CONFIG_GROUPS_ALL_PATTERN) ||
requestURI.matches(API_HOSTS_ALL_PATTERN) ||
requestURI.matches(API_ALERT_TARGETS_ALL_PATTERN) ||
- requestURI.matches(API_PRIVILEGES_ALL_PATTERN) ||
requestURI.matches(API_PERSIST_ALL_PATTERN) ||
requestURI.matches(API_CLUSTERS_UPGRADES_PATTERN);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
index 6ebccbf..75cd5be 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
@@ -147,8 +147,7 @@ public class CredentialProvider {
if (args.length > 2 && !args[2].isEmpty()) {
password = args[2];
}
- if (alias != null && !alias.isEmpty()
- && password != null && !password.isEmpty()) {
+ if (password != null && !password.isEmpty()) {
try {
credentialProvider.addAliasToCredentialStore(alias, password);
} catch (AmbariException e) {
@@ -163,8 +162,7 @@ public class CredentialProvider {
if (args.length > 2 && !args[2].isEmpty()) {
writeFilePath = args[2];
}
- if (alias != null && !alias.isEmpty() && writeFilePath != null &&
- !writeFilePath.isEmpty()) {
+ if (writeFilePath != null && !writeFilePath.isEmpty()) {
String passwd = "";
try {
char[] retPasswd = credentialProvider.getPasswordForAlias(alias);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index ca906b6..02f7616 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -351,7 +351,7 @@ public class CreateKeytabFilesServerAction extends
KerberosServerAction {
if (canCache) {
File cachedKeytabFile = cacheKeytab(principal, keytab);
String previousCachedFilePath =
principalEntity.getCachedKeytabPath();
- String cachedKeytabFilePath = ((cachedKeytabFile == null) ||
!cachedKeytabFile.exists())
+ String cachedKeytabFilePath = (!cachedKeytabFile.exists())
? null
: cachedKeytabFile.getAbsolutePath();
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerAction.java
index 2f32312..bf3b20a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerAction.java
@@ -137,20 +137,18 @@ public class UpdateKerberosConfigsServerAction extends
AbstractServerAction {
clusterEnvProperties.put("security_enabled", securityEnabled);
- if (!configTypes.isEmpty()) {
- String configNote =
getCommandParameterValue(getCommandParameters(),
KerberosServerAction.UPDATE_CONFIGURATION_NOTE);
+ String configNote = getCommandParameterValue(getCommandParameters(),
KerberosServerAction.UPDATE_CONFIGURATION_NOTE);
- if((configNote == null) || configNote.isEmpty()) {
- configNote = cluster.getSecurityType() == SecurityType.KERBEROS
- ? "Enabling Kerberos"
- : "Disabling Kerberos";
- }
+ if((configNote == null) || configNote.isEmpty()) {
+ configNote = cluster.getSecurityType() == SecurityType.KERBEROS
+ ? "Enabling Kerberos"
+ : "Disabling Kerberos";
+ }
- for (String configType : configTypes) {
- configHelper.updateConfigType(cluster,
cluster.getDesiredStackVersion(), controller,
- configType, propertiesToSet.get(configType),
propertiesToRemove.get(configType),
- authenticatedUserName, configNote);
- }
+ for (String configType : configTypes) {
+ configHelper.updateConfigType(cluster,
cluster.getDesiredStackVersion(), controller,
+ configType, propertiesToSet.get(configType),
propertiesToRemove.get(configType),
+ authenticatedUserName, configNote);
}
} catch (IOException e) {
String message = "Could not update services configs to enable
kerberos";
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
index 3302749..a44f675 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
@@ -416,7 +416,7 @@ public class ConfigureAction extends
AbstractUpgradeServerAction {
}
// set all key/value pairs
- if (null != keyValuePairs && !keyValuePairs.isEmpty()) {
+ if (!keyValuePairs.isEmpty()) {
for (ConfigurationKeyValue keyValuePair : keyValuePairs) {
String key = keyValuePair.key;
String value = keyValuePair.value;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 3a143f4..317df81 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -124,8 +124,8 @@ public class ExtensionHelper {
private static void validateServiceDuplication(StackManager stackManager,
StackInfo stack, ExtensionInfo extension, Collection<ServiceInfo> services)
throws AmbariException {
LOG.debug("Looking for duplicate services");
for (ServiceInfo service : services) {
- LOG.debug("Looking for duplicate service " + service.getName());
if (service != null) {
+ LOG.debug("Looking for duplicate service " + service.getName());
ServiceInfo stackService = null;
try {
stackService = stack.getService(service.getName());
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
index 7464e61..36cfc28 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
@@ -446,7 +446,7 @@ public abstract class ServiceDirectory extends
StackDefinitionDirectory {
roleCommandOrder = new StackRoleCommandOrder(result);
- if (LOG.isDebugEnabled() && rcoFile != null) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Role Command Order for {}", rcoFile.getAbsolutePath());
roleCommandOrder.printRoleCommandOrder(LOG);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ClusterGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ClusterGrouping.java
index dd768be..dd61732 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ClusterGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ClusterGrouping.java
@@ -106,65 +106,63 @@ public class ClusterGrouping extends Grouping {
List<StageWrapper> results = new ArrayList<>(stageWrappers);
- if (executionStages != null) {
- for (ExecuteStage execution : executionStages) {
- if (null != execution.intendedDirection
- && execution.intendedDirection != upgradeContext.getDirection())
{
- continue;
- }
+ for (ExecuteStage execution : executionStages) {
+ if (null != execution.intendedDirection
+ && execution.intendedDirection != upgradeContext.getDirection()) {
+ continue;
+ }
- // if there is a condition on the group, evaluate it and skip
scheduling
- // of this group if the condition has not been satisfied
- if (null != execution.condition &&
!execution.condition.isSatisfied(upgradeContext)) {
- LOG.info("Skipping {} while building upgrade orchestration due to
{}", execution,
- execution.condition);
+ // if there is a condition on the group, evaluate it and skip
scheduling
+ // of this group if the condition has not been satisfied
+ if (null != execution.condition &&
!execution.condition.isSatisfied(upgradeContext)) {
+ LOG.info("Skipping {} while building upgrade orchestration due to
{}", execution,
+ execution.condition);
- continue;
- }
+ continue;
+ }
- // only schedule this stage if its service is part of the upgrade
- if (StringUtils.isNotBlank(execution.service)) {
- if (!upgradeContext.isServiceSupported(execution.service)) {
- continue;
- }
+ // only schedule this stage if its service is part of the upgrade
+ if (StringUtils.isNotBlank(execution.service)) {
+ if (!upgradeContext.isServiceSupported(execution.service)) {
+ continue;
}
+ }
- // tasks can have their own condition, so check that too
- if (null != execution.task.condition
- && !execution.task.condition.isSatisfied(upgradeContext)) {
- LOG.info("Skipping {} while building upgrade orchestration due to
{}", execution,
- execution.task.condition);
+ // tasks can have their own condition, so check that too
+ if (null != execution.task.condition
+ && !execution.task.condition.isSatisfied(upgradeContext)) {
+ LOG.info("Skipping {} while building upgrade orchestration due to
{}", execution,
+ execution.task.condition);
- continue;
- }
+ continue;
+ }
- Task task = execution.task;
+ Task task = execution.task;
- StageWrapper wrapper = null;
+ StageWrapper wrapper = null;
- switch (task.getType()) {
- case MANUAL:
- case SERVER_ACTION:
- case CONFIGURE:
- case ADD_COMPONENT:
- wrapper = getServerActionStageWrapper(upgradeContext, execution);
- break;
+ switch (task.getType()) {
+ case MANUAL:
+ case SERVER_ACTION:
+ case CONFIGURE:
+ case ADD_COMPONENT:
+ wrapper = getServerActionStageWrapper(upgradeContext, execution);
+ break;
- case EXECUTE:
- wrapper = getExecuteStageWrapper(upgradeContext, execution);
- break;
+ case EXECUTE:
+ wrapper = getExecuteStageWrapper(upgradeContext, execution);
+ break;
- case REGENERATE_KEYTABS:
- wrapper = getRegenerateKeytabsWrapper(upgradeContext, execution);
- break;
+ case REGENERATE_KEYTABS:
+ wrapper = getRegenerateKeytabsWrapper(upgradeContext, execution);
+ break;
- default:
- break;
- }
+ default:
+ break;
+ }
- if (null != wrapper) {
- results.add(wrapper);
- }
+ if (null != wrapper) {
+ results.add(wrapper);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
index 56a201b..f90a489 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ColocatedGrouping.java
@@ -275,18 +275,16 @@ public class ColocatedGrouping extends Grouping {
}
if (!proxy.restart) {
- if (null == wrapper) {
- TaskWrapper[] tasks = proxy.getTasksArray(predicate);
+ TaskWrapper[] tasks = proxy.getTasksArray(predicate);
- if (LOG.isDebugEnabled()) {
- for (TaskWrapper tw : tasks) {
- LOG.debug("{}", tw);
- }
+ if (LOG.isDebugEnabled()) {
+ for (TaskWrapper tw : tasks) {
+ LOG.debug("{}", tw);
}
+ }
- if (ArrayUtils.isNotEmpty(tasks)) {
- wrapper = new StageWrapper(proxy.type, proxy.message, tasks);
- }
+ if (ArrayUtils.isNotEmpty(tasks)) {
+ wrapper = new StageWrapper(proxy.type, proxy.message, tasks);
}
} else {
TaskWrapper[] tasks = proxy.getTasksArray(null);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigureTask.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigureTask.java
index 57096b6..4ddf36c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigureTask.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigureTask.java
@@ -235,7 +235,7 @@ public class ConfigureTask extends ServerSideActionTask {
//Fetch the replacements that used regex to find a string
replacements.addAll(definition.getRegexReplacements(cluster));
- if( null != replacements && !replacements.isEmpty() ){
+ if( !replacements.isEmpty() ){
List<Replace> allowedReplacements = getValidReplacements(cluster,
definition.getConfigType(), replacements);
configParameters.put(ConfigureTask.PARAMETER_REPLACEMENTS,
m_gson.toJson(allowedReplacements));
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
index 76eab07..508a6db 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeHelper.java
@@ -1110,28 +1110,25 @@ public class UpgradeHelper {
}
}
- if (null != newServiceDefaultConfigsByType) {
-
- for (String clusterConfigType : clusterConfigTypes) {
- if (processedClusterConfigTypes.contains(clusterConfigType)) {
- newServiceDefaultConfigsByType.remove(clusterConfigType);
- } else {
- processedClusterConfigTypes.add(clusterConfigType);
- }
-
+ for (String clusterConfigType : clusterConfigTypes) {
+ if (processedClusterConfigTypes.contains(clusterConfigType)) {
+ newServiceDefaultConfigsByType.remove(clusterConfigType);
+ } else {
+ processedClusterConfigTypes.add(clusterConfigType);
}
- Set<String> configTypes = newServiceDefaultConfigsByType.keySet();
- LOG.warn("The upgrade will create the following configurations for
stack {}: {}",
- targetStackId, StringUtils.join(configTypes, ','));
+ }
- String serviceVersionNote = String.format("%s %s %s",
direction.getText(true),
- direction.getPreposition(),
upgradeContext.getRepositoryVersion().getVersion());
+ Set<String> configTypes = newServiceDefaultConfigsByType.keySet();
+ LOG.warn("The upgrade will create the following configurations for stack
{}: {}",
+ targetStackId, StringUtils.join(configTypes, ','));
- configHelper.createConfigTypes(cluster, targetStackId, controller,
- newServiceDefaultConfigsByType, userName, serviceVersionNote);
- configsChanged = true;
- }
+ String serviceVersionNote = String.format("%s %s %s",
direction.getText(true),
+ direction.getPreposition(),
upgradeContext.getRepositoryVersion().getVersion());
+
+ configHelper.createConfigTypes(cluster, targetStackId, controller,
+ newServiceDefaultConfigsByType, userName, serviceVersionNote);
+ configsChanged = true;
}
if (configsChanged) {
m_configHelperProvider.get().updateAgentConfigs(Collections.singleton(cluster.getClusterName()));
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 91fe76e..731dab3 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
@@ -274,7 +274,7 @@ public class ConfigHelper {
Entry<PropertyInfo, String> property = iterator.next();
PropertyInfo propertyInfo = property.getKey();
String propertyValue = property.getValue();
- if (property == null || propertyValue == null ||
propertyValue.toLowerCase().equals("null") || propertyValue.isEmpty()) {
+ if (propertyValue == null || propertyValue.toLowerCase().equals("null")
|| propertyValue.isEmpty()) {
LOG.error(String.format("Excluding property %s from %s, because of
invalid or empty value!", propertyInfo.getName(), filteredListName));
iterator.remove();
} else {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
index 3a0cd6d..9da9771 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
@@ -396,10 +396,10 @@ public class ConfigImpl implements Config {
@Transactional
public void save() {
ClusterConfigEntity entity = clusterDAO.findConfig(configId);
- ClusterEntity clusterEntity = clusterDAO.findById(entity.getClusterId());
// if the configuration was found, then update it
if (null != entity) {
+ ClusterEntity clusterEntity = clusterDAO.findById(entity.getClusterId());
LOG.debug("Updating {} version {} with new configurations; a new version
will not be created",
getType(), getVersion());
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
index 539b624..27fe886 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
@@ -556,7 +556,7 @@ public class AlertDefinitionHash {
hostName);
// no definitions found for this host, don't bother hashing
- if( null == definitions || definitions.size() == 0 ) {
+ if(definitions.isEmpty()) {
return NULL_MD5_HASH;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java
index 7504d45..de0a2ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java
@@ -190,9 +190,7 @@ public class StackAdvisorAdapter {
if
(info.getRequest().getRecommendationStrategy().shouldOverrideCustomValues()) {
config = recommendedConfig;
config.setParentConfiguration(userConfig);
- }
- else {
- config = userConfig;
+ } else {
config.setParentConfiguration(recommendedConfig);
recommendedConfig.setParentConfiguration(clusterAndStackConfig);
}
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 1d9b28f..6efcdee 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
@@ -512,12 +512,10 @@ public class HostUpdateHelper {
Collection<TopologyHostInfoEntity> topologyHostInfoEntities =
topologyHostGroupEntity.getTopologyHostInfoEntities();
boolean updatesAvailable = false;
- if (topologyHostGroupEntities != null) {
- for (TopologyHostInfoEntity topologyHostInfoEntity :
topologyHostInfoEntities) {
- if
(currentHostNames.contains(topologyHostInfoEntity.getFqdn())) {
-
topologyHostInfoEntity.setFqdn(hostMapping.get(topologyHostInfoEntity.getFqdn()));
- updatesAvailable = true;
- }
+ for (TopologyHostInfoEntity topologyHostInfoEntity :
topologyHostInfoEntities) {
+ if
(currentHostNames.contains(topologyHostInfoEntity.getFqdn())) {
+
topologyHostInfoEntity.setFqdn(hostMapping.get(topologyHostInfoEntity.getFqdn()));
+ updatesAvailable = true;
}
}
if (updatesAvailable) {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
index 6bcf8a9..42bde6f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
@@ -751,7 +751,7 @@ public class UpgradeCatalog260 extends
AbstractUpgradeCatalog {
// Get the keytab file 'config name'.
String[] splits =
keytabDescriptor.getConfiguration().split("/");
- if (splits != null && splits.length == 2) {
+ if (splits.length == 2) {
updateYarnKerberosDescUpdatedList(splits[1]);
LOG.info(" Updated 'yarnKerberosDescUpdatedList' = " +
getYarnKerberosDescUpdatedList());
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/utils/HTTPUtils.java
b/ambari-server/src/main/java/org/apache/ambari/server/utils/HTTPUtils.java
index 1632c38..6c7ceee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/HTTPUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/HTTPUtils.java
@@ -63,14 +63,12 @@ public class HTTPUtils {
rd = new BufferedReader(new InputStreamReader(resultInputStream));
- if (rd != null) {
+ line = rd.readLine();
+ while (line != null) {
+ result += line;
line = rd.readLine();
- while (line != null) {
- result += line;
- line = rd.readLine();
- }
- rd.close();
}
+ rd.close();
} catch (Exception e) {
e.printStackTrace();
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/utils/MpackVersion.java
b/ambari-server/src/main/java/org/apache/ambari/server/utils/MpackVersion.java
index 8d24260..7d7b58c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/utils/MpackVersion.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/utils/MpackVersion.java
@@ -83,9 +83,6 @@ public class MpackVersion implements Comparable<MpackVersion>
{
mpackVersion = format(mpackVersion);
}
Matcher versionMatcher = validateMpackVersion(mpackVersion);
- if(versionMatcher == null) {
- throw new IllegalArgumentException("Wrong format for mpack version");
- }
if (versionMatcher.pattern().pattern().equals(VERSION_WITH_BUILD_PATTERN))
{
return new MpackVersion(Integer.parseInt(versionMatcher.group(1)),
Integer.parseInt(versionMatcher.group(2)),
Integer.parseInt(versionMatcher.group(3)), 0,
Integer.parseInt(versionMatcher.group(4)));
@@ -138,9 +135,6 @@ public class MpackVersion implements
Comparable<MpackVersion> {
* */
public static MpackVersion parseStackVersion(String stackVersion) {
Matcher versionMatcher = validateStackVersion(stackVersion);
- if(versionMatcher == null) {
- throw new IllegalArgumentException("Wrong format for mpack version");
- }
if(versionMatcher.pattern().pattern().equals(LEGACY_STACK_VERSION_PATTERN)) {
return new MpackVersion(Integer.parseInt(versionMatcher.group(1)),
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
index d0351d0..48537d6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
@@ -343,18 +343,16 @@ public class StageUtils {
for (String hostName :
serviceComponent.getServiceComponentHosts().keySet()) {
- if (roleName != null) {
- SortedSet<Integer> hostsForComponentsHost =
hostRolesInfo.get(roleName);
+ SortedSet<Integer> hostsForComponentsHost =
hostRolesInfo.get(roleName);
- if (hostsForComponentsHost == null) {
- hostsForComponentsHost = new TreeSet<>();
- hostRolesInfo.put(roleName, hostsForComponentsHost);
- }
-
- int hostIndex = hostsList.indexOf(hostName);
- //Add index of host to current host role
- hostsForComponentsHost.add(hostIndex);
+ if (hostsForComponentsHost == null) {
+ hostsForComponentsHost = new TreeSet<>();
+ hostRolesInfo.put(roleName, hostsForComponentsHost);
}
+
+ int hostIndex = hostsList.indexOf(hostName);
+ //Add index of host to current host role
+ hostsForComponentsHost.add(hostIndex);
}
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
index 7e67891..aa0683d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
@@ -143,14 +143,12 @@ public class HttpImpersonatorImpl implements
HttpImpersonator {
rd = new BufferedReader(new InputStreamReader(resultInputStream));
- if (rd != null) {
+ line = rd.readLine();
+ while (line != null) {
+ result += line;
line = rd.readLine();
- while (line != null) {
- result += line;
- line = rd.readLine();
- }
- rd.close();
}
+ rd.close();
} catch (Exception e) {
LOG.error("Exception caught processing impersonator request.", e);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
index 5f6201a..ce0e652 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
@@ -272,8 +272,7 @@ public class ViewSubResourceProvider extends
AbstractResourceProvider {
// get the resource type associated with the given
UnsupportedPropertyException
private Resource.Type
getResourceType(org.apache.ambari.view.UnsupportedPropertyException e) {
- Resource.Type type = Resource.Type.valueOf(e.getType());
- return type == null ? this.type : type;
+ return Resource.Type.valueOf(e.getType());
}
// discover the property ids for the given bean class
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
index 5ad3ead..f7e8501 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
@@ -213,7 +213,7 @@ public class PersistenceManagerImplTest {
mapResourceProps1.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
Map<String, Object> mapResourceProps2 = new HashMap<>();
- mapResourceProps1.put("componentId", "id2");
+ mapResourceProps2.put("componentId", "id2");
mapResourceProps2.put(PropertyHelper.getPropertyId("foo", "bar2"),
"value2");
NamedPropertySet namedPropSet1 = new NamedPropertySet("",
mapResourceProps1);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 4926e87..92b32ef 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -3399,7 +3399,6 @@ public class AmbariManagementControllerTest {
Set<ServiceRequest> reqs = new HashSet<>();
ServiceRequest req1, req2;
try {
- reqs.clear();
req1 = new ServiceRequest(cluster1, serviceName1,
repositoryVersion02.getId(),
State.STARTED.toString(), null);
reqs.add(req1);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
index 26fd36e..965ef71 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
@@ -113,7 +113,7 @@ public class HostComponentResourceProviderTest {
ResourceProviderFactory resourceProviderFactory =
createNiceMock(ResourceProviderFactory.class);
Injector injector = createNiceMock(Injector.class);
HostComponentResourceProvider hostComponentResourceProvider =
- new HostComponentResourceProvider(managementController, injector);
+ new HostComponentResourceProvider(managementController);
AbstractControllerResourceProvider.init(resourceProviderFactory);
@@ -450,7 +450,7 @@ public class HostComponentResourceProviderTest {
Injector injector = createNiceMock(Injector.class);
HostComponentResourceProvider provider =
- new HostComponentResourceProvider(managementController, injector);
+ new HostComponentResourceProvider(managementController);
// set expectations
expect(managementController.deleteHostComponents(
@@ -489,7 +489,7 @@ public class HostComponentResourceProviderTest {
Injector injector = createNiceMock(Injector.class);
HostComponentResourceProvider provider =
- new HostComponentResourceProvider(managementController, injector);
+ new HostComponentResourceProvider(managementController);
Set<String> unsupported =
provider.checkPropertyIds(Collections.singleton(PropertyHelper.getPropertyId("HostRoles",
"cluster_name")));
Assert.assertTrue(unsupported.isEmpty());
@@ -717,7 +717,7 @@ public class HostComponentResourceProviderTest {
*/
public TestHostComponentResourceProvider(Set<String> propertyIds,
Map<Resource.Type, String> keyPropertyIds,
AmbariManagementController
managementController, Injector injector) throws Exception {
- super(managementController, injector);
+ super(managementController);
}
public void setFieldValue(String fieldName, Object fieldValue) throws
Exception {
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
index cc178da..d814ae0 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
@@ -634,7 +634,7 @@ public class JMXHostProviderTest {
maintenanceStateHelper, repositoryVersionDAO);
ResourceProvider hostCompResourceProvider = new
- HostComponentResourceProvider(controller, injector);
+ HostComponentResourceProvider(controller);
ResourceProvider configResourceProvider = new
ConfigurationResourceProvider(
controller);
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
index d81d00c..38af25f 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
@@ -618,12 +618,7 @@ public class UpgradeActionTest {
// repo 2110 - CURRENT
// repo 2111 - CURRENT (PATCH)
for (HostVersionEntity hostVersion : hostVersions) {
- RepositoryVersionEntity hostRepoVersion =
hostVersion.getRepositoryVersion();
- if (repositoryVersion2110.equals(hostRepoVersion)) {
- hostVersion.setState(RepositoryVersionState.CURRENT);
- } else {
- hostVersion.setState(RepositoryVersionState.CURRENT);
- }
+ hostVersion.setState(RepositoryVersionState.CURRENT);
hostVersionDAO.merge(hostVersion);
}
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
index 3a98ab0..d91a30d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
@@ -239,8 +239,7 @@ public class ClusterDeployWithStartOnlyTest extends
EasyMockSupport {
group1ServiceComponents.put("service1", Arrays.asList("component1",
"component3"));
group1ServiceComponents.put("service2",
Collections.singleton("component2"));
- group2ServiceComponents.put("service2",
Collections.singleton("component3"));
- group2ServiceComponents.put("service2",
Collections.singleton("component4"));
+ group2ServiceComponents.put("service2", Arrays.asList("component3",
"component4"));
expect(blueprint.getHostGroup("group1")).andReturn(group1).anyTimes();
expect(blueprint.getHostGroup("group2")).andReturn(group2).anyTimes();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
index 46e3ff9..2067620 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
@@ -235,8 +235,7 @@ public class ClusterInstallWithoutStartOnComponentLevelTest
extends EasyMockSupp
group1ServiceComponents.put("service1", Arrays.asList("component1",
"component3"));
group1ServiceComponents.put("service2",
Collections.singleton("component2"));
- group2ServiceComponents.put("service2",
Collections.singleton("component3"));
- group2ServiceComponents.put("service2",
Collections.singleton("component4"));
+ group2ServiceComponents.put("service2", Arrays.asList("component3",
"component4"));
expect(blueprint.getHostGroup("group1")).andReturn(group1).anyTimes();
expect(blueprint.getHostGroup("group2")).andReturn(group2).anyTimes();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
index 61face9..59acbe9 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
@@ -237,8 +237,7 @@ public class ClusterInstallWithoutStartTest extends
EasyMockSupport {
group1ServiceComponents.put("service1", Arrays.asList("component1",
"component3"));
group1ServiceComponents.put("service2",
Collections.singleton("component2"));
- group2ServiceComponents.put("service2",
Collections.singleton("component3"));
- group2ServiceComponents.put("service2",
Collections.singleton("component4"));
+ group2ServiceComponents.put("service2", Arrays.asList("component3",
"component4"));
expect(blueprint.getHostGroup("group1")).andReturn(group1).anyTimes();
expect(blueprint.getHostGroup("group2")).andReturn(group2).anyTimes();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
index cc9e7e9..71e5fb6 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
@@ -244,8 +244,7 @@ public class TopologyManagerTest {
group1ServiceComponents.put("service1", Arrays.asList("component1",
"component3"));
group1ServiceComponents.put("service2",
Collections.singleton("component2"));
- group2ServiceComponents.put("service2",
Collections.singleton("component3"));
- group2ServiceComponents.put("service2",
Collections.singleton("component4"));
+ group2ServiceComponents.put("service2", Arrays.asList("component3",
"component4"));
expect(blueprint.getHostGroup("group1")).andReturn(group1).anyTimes();
expect(blueprint.getHostGroup("group2")).andReturn(group2).anyTimes();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/NameNodeHaValidatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/NameNodeHaValidatorTest.java
index 54f2648..108a4c5 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/NameNodeHaValidatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/NameNodeHaValidatorTest.java
@@ -177,7 +177,6 @@ public class NameNodeHaValidatorTest {
List<String> nameNodeHosts = ImmutableList.copyOf(hosts).subList(0, 2);
nameNodes.addAll(nameNodeHosts);
- hadoopEnv.put("dfs_ha_initial_namenode_active", nameNodeHosts.get(0));
hadoopEnv.put("dfs_ha_initial_namenode_active", nameNodeHosts.get(1));
validator.validate(clusterTopology);
diff --git
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/UserLocal.java
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/UserLocal.java
index 41c60ab..db2cd39 100644
---
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/UserLocal.java
+++
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/UserLocal.java
@@ -110,11 +110,9 @@ public class UserLocal<T> {
}
else {
try {
- if (!instances.containsKey(key)) {
- T initValue = initialValue(context);
- LOG.info("Obtained initial value : {} for key : {}",initValue,key);
- instances.put(key, initValue);
- }
+ T initValue = initialValue(context);
+ LOG.info("Obtained initial value : {} for key : {}",initValue,key);
+ instances.put(key, initValue);
}finally{
lock.unlock();
}
