You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/12 16:34:31 UTC
[07/11] ambari git commit: AMBARI-19149. Code cleanup: concatenation
in debug messages, unnecessary toString calls
AMBARI-19149. Code cleanup: concatenation in debug messages, unnecessary toString calls
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/219f2234
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/219f2234
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/219f2234
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 219f22345e6f7b7ad38cdaac02e9bbe8c8ad7254
Parents: d510522
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed May 31 10:25:58 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Mon Jun 12 11:30:03 2017 +0200
----------------------------------------------------------------------
ambari-server/pom.xml | 4 --
.../server/KdcServerConnectionVerification.java | 2 +-
.../ambari/server/StateRecoveryManager.java | 2 +-
.../actionmanager/ActionDBAccessorImpl.java | 6 +-
.../server/actionmanager/ActionManager.java | 8 +--
.../server/actionmanager/ActionScheduler.java | 18 +++--
.../ambari/server/actionmanager/Stage.java | 6 +-
.../apache/ambari/server/agent/ActionQueue.java | 2 +-
.../ambari/server/agent/AgentRequests.java | 10 +--
.../ambari/server/agent/ExecutionCommand.java | 6 +-
.../ambari/server/agent/HeartBeatHandler.java | 17 ++---
.../ambari/server/agent/HeartbeatMonitor.java | 14 ++--
.../ambari/server/agent/HeartbeatProcessor.java | 4 +-
.../apache/ambari/server/agent/HostInfo.java | 2 +-
.../apache/ambari/server/agent/Register.java | 2 +-
.../ambari/server/agent/rest/AgentResource.java | 18 ++---
.../ambari/server/api/query/QueryImpl.java | 4 +-
.../server/api/rest/BootStrapResource.java | 6 +-
.../server/api/services/AmbariMetaInfo.java | 12 ++--
.../ambari/server/api/services/BaseRequest.java | 2 +-
.../api/services/PersistKeyValueService.java | 16 ++---
.../services/parsers/JsonRequestBodyParser.java | 2 +-
.../StackAdvisorBlueprintProcessor.java | 2 +-
.../commands/StackAdvisorCommand.java | 10 +--
.../views/ViewDataMigrationService.java | 6 +-
.../server/bootstrap/BSHostStatusCollector.java | 12 ++--
.../ambari/server/bootstrap/BSRunner.java | 14 ++--
.../ambari/server/bootstrap/BootStrapImpl.java | 6 +-
.../server/checks/UpgradeCheckRegistry.java | 4 +-
.../controller/AmbariActionExecutionHelper.java | 9 +--
.../AmbariCustomCommandExecutionHelper.java | 10 ++-
.../server/controller/AmbariHandlerList.java | 2 +-
.../AmbariManagementControllerImpl.java | 75 +++++++-------------
.../ambari/server/controller/AmbariServer.java | 2 +-
.../server/controller/ControllerModule.java | 2 +-
.../internal/AbstractPropertyProvider.java | 4 +-
.../internal/AbstractProviderModule.java | 15 ++--
.../internal/ActionResourceProvider.java | 3 +-
.../controller/internal/AppCookieManager.java | 8 +--
.../controller/internal/BaseProvider.java | 10 +--
.../BlueprintConfigurationProcessor.java | 9 ++-
.../internal/ClientConfigResourceProvider.java | 2 +-
.../internal/ClusterControllerImpl.java | 4 +-
.../internal/ClusterResourceProvider.java | 6 +-
...atibleRepositoryVersionResourceProvider.java | 2 +-
.../internal/ComponentResourceProvider.java | 6 +-
.../internal/ConfigGroupResourceProvider.java | 12 ++--
.../internal/GroupResourceProvider.java | 4 +-
.../internal/HostComponentResourceProvider.java | 2 +-
.../internal/HostResourceProvider.java | 12 ++--
.../controller/internal/HostStatusHelper.java | 2 +-
.../internal/JobResourceProvider.java | 12 ++--
.../internal/MemberResourceProvider.java | 4 +-
.../PreUpgradeCheckResourceProvider.java | 2 +-
.../internal/RequestResourceProvider.java | 6 +-
.../internal/RequestStageContainer.java | 2 +-
.../internal/ServiceResourceProvider.java | 53 ++++----------
.../internal/TaskAttemptResourceProvider.java | 6 +-
.../controller/internal/URLStreamProvider.java | 10 +--
.../internal/UserResourceProvider.java | 4 +-
.../internal/WidgetLayoutResourceProvider.java | 4 +-
.../internal/WorkflowResourceProvider.java | 6 +-
.../server/controller/jmx/JMXMetricHolder.java | 2 +-
.../logging/LogSearchDataRetrievalService.java | 4 +-
.../logging/LoggingRequestHelperImpl.java | 15 ++--
.../logging/LoggingSearchPropertyProvider.java | 4 +-
.../metrics/MetricsCollectorHAManager.java | 2 +-
.../metrics/MetricsDownsamplingMethod.java | 5 +-
.../metrics/timeline/AMSPropertyProvider.java | 2 +-
.../metrics/timeline/MetricsRequestHelper.java | 20 +++---
.../timeline/cache/TimelineMetricCache.java | 28 +++-----
.../cache/TimelineMetricCacheEntryFactory.java | 46 +++++-------
.../cache/TimelineMetricsCacheSizeOfEngine.java | 6 +-
.../controller/utilities/KerberosChecker.java | 2 +-
.../ServiceCalculatedStateFactory.java | 2 +-
.../server/credentialapi/CredentialUtil.java | 2 +-
.../customactions/ActionDefinitionManager.java | 6 +-
.../alerts/AlertHashInvalidationListener.java | 2 +-
.../alerts/AlertLifecycleListener.java | 2 +-
.../alerts/AlertMaintenanceModeListener.java | 2 +-
.../AlertServiceComponentHostListener.java | 2 +-
.../alerts/AlertServiceStateListener.java | 2 +-
.../alerts/AlertStateChangedListener.java | 2 +-
.../CachedRoleCommandOrderProvider.java | 2 +-
.../server/metadata/RoleCommandOrder.java | 7 +-
.../system/impl/AmbariPerformanceMonitor.java | 4 +-
.../system/impl/DatabaseMetricsSource.java | 2 +-
.../metrics/system/impl/JvmMetricsSource.java | 2 +-
.../system/impl/MetricsConfiguration.java | 2 +-
.../metrics/system/impl/MetricsServiceImpl.java | 2 +-
.../ambari/server/orm/DBAccessorImpl.java | 2 +-
.../server/orm/dao/AlertDefinitionDAO.java | 2 +-
.../orm/entities/RepositoryVersionEntity.java | 2 +-
.../orm/helpers/dbms/GenericDbmsHelper.java | 4 +-
.../server/resources/ResourceManager.java | 11 ++-
.../server/resources/api/rest/GetResource.java | 9 ++-
.../scheduler/AbstractLinearExecutionJob.java | 6 +-
.../scheduler/ExecutionScheduleManager.java | 12 ++--
.../scheduler/ExecutionSchedulerImpl.java | 4 +-
.../server/security/CertificateManager.java | 6 +-
.../ambari/server/security/SecurityFilter.java | 12 ++--
.../AmbariLdapBindAuthenticator.java | 2 +-
.../AmbariPamAuthenticationProvider.java | 2 +-
.../jwt/JwtAuthenticationFilter.java | 2 +-
.../encryption/MasterKeyServiceImpl.java | 8 +--
.../unsecured/rest/CertificateDownload.java | 6 +-
.../unsecured/rest/CertificateSign.java | 6 +-
.../security/unsecured/rest/ConnectionInfo.java | 6 +-
.../kerberos/ADKerberosOperationHandler.java | 6 +-
.../kerberos/CreateKeytabFilesServerAction.java | 6 +-
.../kerberos/DestroyPrincipalsServerAction.java | 2 +-
.../kerberos/IPAKerberosOperationHandler.java | 18 ++---
.../kerberos/MITKerberosOperationHandler.java | 2 +-
.../serveraction/upgrades/ConfigureAction.java | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 2 +-
.../upgrades/UpdateDesiredStackAction.java | 2 +-
.../ambari/server/stack/ExtensionDirectory.java | 2 +-
.../ambari/server/stack/ExtensionModule.java | 4 +-
.../ambari/server/stack/MasterHostResolver.java | 2 +-
.../ambari/server/stack/ServiceDirectory.java | 2 +-
.../ambari/server/stack/ServiceModule.java | 4 +-
.../ambari/server/stack/StackDirectory.java | 7 +-
.../ambari/server/stack/StackManager.java | 9 +--
.../apache/ambari/server/stack/StackModule.java | 20 ++----
.../ambari/server/stageplanner/RoleGraph.java | 2 +-
.../apache/ambari/server/state/CheckHelper.java | 2 +-
.../server/state/ServiceComponentImpl.java | 21 ++----
.../apache/ambari/server/state/ServiceImpl.java | 21 ++----
.../apache/ambari/server/state/StackInfo.java | 2 +-
.../ambari/server/state/action/ActionImpl.java | 23 +++---
.../server/state/cluster/ClusterImpl.java | 45 +++++-------
.../server/state/cluster/ClustersImpl.java | 6 +-
.../ambari/server/state/host/HostImpl.java | 31 +++-----
.../server/state/stack/ConfigUpgradePack.java | 2 +-
.../state/stack/StackRoleCommandOrder.java | 2 +-
.../ambari/server/state/stack/UpgradePack.java | 2 +-
.../state/stack/upgrade/ColocatedGrouping.java | 2 +-
.../upgrade/ConfigUpgradeChangeDefinition.java | 2 +-
.../state/stack/upgrade/ConfigureTask.java | 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../state/stack/upgrade/RestartGrouping.java | 2 +-
.../stack/upgrade/ServiceCheckGrouping.java | 2 +-
.../state/stack/upgrade/StartGrouping.java | 2 +-
.../state/stack/upgrade/StopGrouping.java | 2 +-
.../state/stack/upgrade/TaskWrapperBuilder.java | 2 +-
.../svccomphost/ServiceComponentHostImpl.java | 18 ++---
.../server/topology/BlueprintValidatorImpl.java | 2 +-
.../topology/tasks/ConfigureClusterTask.java | 2 +-
.../server/topology/tasks/TopologyHostTask.java | 4 +-
.../validators/ClusterConfigTypeValidator.java | 2 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 2 +-
.../server/upgrade/SchemaUpgradeHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog222.java | 2 +-
.../server/upgrade/UpgradeCatalog250.java | 10 +--
.../apache/ambari/server/utils/AmbariPath.java | 2 +-
.../ambari/server/utils/CommandUtils.java | 2 +-
.../ambari/server/utils/SecretReference.java | 2 +-
.../ambari/server/utils/ShellCommandUtil.java | 6 +-
.../apache/ambari/server/utils/StageUtils.java | 6 +-
.../server/view/HttpImpersonatorImpl.java | 2 +-
.../server/view/ViewAmbariStreamProvider.java | 2 +-
.../ambari/server/view/ViewContextImpl.java | 6 +-
.../view/ViewDataMigrationContextImpl.java | 6 +-
.../server/view/ViewDataMigrationUtility.java | 4 +-
.../server/view/ViewDirectoryWatcher.java | 6 +-
.../ambari/server/view/ViewExtractor.java | 8 +--
.../apache/ambari/server/view/ViewRegistry.java | 27 ++++---
.../server/view/ViewURLStreamProvider.java | 14 ++--
.../ambari/server/agent/AgentResourceTest.java | 6 +-
.../server/agent/LocalAgentSimulator.java | 6 +-
.../ambari/server/agent/TestActionQueue.java | 2 +-
.../server/agent/TestHeartbeatHandler.java | 4 +-
.../server/api/services/AmbariMetaInfoTest.java | 4 +-
.../server/api/services/PersistServiceTest.java | 6 +-
.../server/bootstrap/BootStrapResourceTest.java | 6 +-
.../ambari/server/bootstrap/BootStrapTest.java | 6 +-
.../AmbariManagementControllerTest.java | 17 +++--
.../AbstractJDBCResourceProviderTest.java | 2 +-
.../CredentialResourceProviderTest.java | 10 +--
.../metrics/ganglia/GangliaMetricTest.java | 2 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 2 +-
.../orm/dao/RepositoryVersionDAOTest.java | 2 +-
.../server/security/CertGenerationTest.java | 6 +-
.../server/security/SslExecutionTest.java | 6 +-
.../encryption/MasterKeyServiceTest.java | 6 +-
.../ambari/server/state/host/HostTest.java | 6 +-
.../svccomphost/ServiceComponentHostTest.java | 5 +-
.../server/testing/DBInconsistencyTests.java | 2 +-
.../ambari/server/upgrade/UpgradeTest.java | 2 +-
189 files changed, 555 insertions(+), 765 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 669f90f..d2b65af 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1348,10 +1348,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
index 19b13aa..1f0403b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
@@ -57,7 +57,7 @@ import com.google.inject.Singleton;
@Singleton
public class KdcServerConnectionVerification {
- private static Logger LOG = LoggerFactory.getLogger(KdcServerConnectionVerification.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KdcServerConnectionVerification.class);
private Configuration config;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
index c92536e..03990a2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
@@ -36,7 +36,7 @@ import com.google.inject.Inject;
*/
public class StateRecoveryManager {
- private static Logger LOG = LoggerFactory.getLogger(StateRecoveryManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StateRecoveryManager.class);
@Inject
private HostVersionDAO hostVersionDAO;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 982316d..94bb892 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -579,9 +579,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
long stageId, String role, CommandReport report) {
boolean checkRequest = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Update HostRoleState: "
- + "HostName " + hostname + " requestId " + requestId + " stageId "
- + stageId + " role " + role + " report " + report);
+ LOG.debug("Update HostRoleState: HostName {} requestId {} stageId {} role {} report {}", hostname, requestId, stageId, role, report);
}
long now = System.currentTimeMillis();
@@ -958,7 +956,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
.withTaskId(String.valueOf(commandEntity.getTaskId()))
.withHostName(commandEntity.getHostName())
.withUserName(details.getUserName())
- .withOperation(commandEntity.getRoleCommand().toString() + " " + commandEntity.getRole().toString())
+ .withOperation(commandEntity.getRoleCommand() + " " + commandEntity.getRole())
.withDetails(commandEntity.getCommandDetail())
.withStatus(commandEntity.getStatus().toString())
.withRequestId(String.valueOf(requestId))
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
index 3182b50..e809980 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
@@ -43,7 +43,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class ActionManager {
- private static Logger LOG = LoggerFactory.getLogger(ActionManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionManager.class);
private final ActionScheduler scheduler;
private final ActionDBAccessor db;
private final AtomicLong requestCounter;
@@ -84,10 +84,10 @@ public class ActionManager {
public void sendActions(Request request, ExecuteActionRequest executeActionRequest) throws AmbariException {
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Persisting Request into DB: %s", request));
+ LOG.debug("Persisting Request into DB: {}", request);
if (executeActionRequest != null) {
- LOG.debug("In response to request: " + request.toString());
+ LOG.debug("In response to request: {}", request);
}
}
db.persistActions(request);
@@ -147,7 +147,7 @@ public class ActionManager {
for (CommandReport report : reports) {
HostRoleCommand command = commands.get(report.getTaskId());
if (LOG.isDebugEnabled()) {
- LOG.debug("Processing command report : " + report.toString());
+ LOG.debug("Processing command report : {}", report);
}
if (command == null) {
LOG.warn("The task " + report.getTaskId()
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index e779f78..9a45d1f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -101,7 +101,7 @@ import com.google.inject.persist.UnitOfWork;
@Singleton
class ActionScheduler implements Runnable {
- private static Logger LOG = LoggerFactory.getLogger(ActionScheduler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionScheduler.class);
public static final String FAILED_TASK_ABORT_REASONING =
"Server considered task failed and automatically aborted it";
@@ -395,7 +395,7 @@ class ActionScheduler implements Runnable {
// Check if we can process this stage in parallel with another stages
i_stage++;
long requestId = stage.getRequestId();
- LOG.debug("==> STAGE_i = " + i_stage + "(requestId=" + requestId + ",StageId=" + stage.getStageId() + ")");
+ LOG.debug("==> STAGE_i = {}(requestId={},StageId={})", i_stage, requestId, stage.getStageId());
RequestEntity request = db.getRequestEntity(requestId);
@@ -735,7 +735,7 @@ class ActionScheduler implements Runnable {
}
int i_my = 0;
- LOG.trace("===>host=" + host);
+ LOG.trace("===>host={}", host);
for (ExecutionCommandWrapper wrapper : commandWrappers) {
ExecutionCommand c = wrapper.getExecutionCommand();
@@ -743,8 +743,7 @@ class ActionScheduler implements Runnable {
HostRoleStatus status = s.getHostRoleStatus(host, roleStr);
i_my++;
if (LOG.isTraceEnabled()) {
- LOG.trace("Host task " + i_my + ") id = " + c.getTaskId() + " status = " + status.toString() +
- " (role=" + roleStr + "), roleCommand = " + c.getRoleCommand());
+ LOG.trace("Host task {}) id = {} status = {} (role={}), roleCommand = {}", i_my, c.getTaskId(), status, roleStr, c.getRoleCommand());
}
boolean hostDeleted = false;
if (null != cluster) {
@@ -789,7 +788,7 @@ class ActionScheduler implements Runnable {
commandTimeout += Long.parseLong(timeoutStr) * 1000; // Converting to milliseconds
} else {
LOG.error("Execution command has no timeout parameter" +
- c.toString());
+ c);
}
}
@@ -853,7 +852,7 @@ class ActionScheduler implements Runnable {
// reschedule command
commandsToSchedule.add(c);
- LOG.trace("===> commandsToSchedule(reschedule)=" + commandsToSchedule.size());
+ LOG.trace("===> commandsToSchedule(reschedule)={}", commandsToSchedule.size());
}
} else if (status.equals(HostRoleStatus.PENDING)) {
// in case of DEPENDENCY_ORDERED stage command can be scheduled only if all of it's dependencies are
@@ -865,7 +864,7 @@ class ActionScheduler implements Runnable {
//Need to schedule first time
commandsToSchedule.add(c);
- LOG.trace("===>commandsToSchedule(first_time)=" + commandsToSchedule.size());
+ LOG.trace("===>commandsToSchedule(first_time)={}", commandsToSchedule.size());
}
}
@@ -962,8 +961,7 @@ class ActionScheduler implements Runnable {
}
} catch (ServiceComponentNotFoundException scnex) {
- LOG.debug(componentName + " associated with service " + serviceName +
- " is not a service component, assuming it's an action.");
+ LOG.debug("{} associated with service {} is not a service component, assuming it's an action.", componentName, serviceName);
} catch (ServiceComponentHostNotFoundException e) {
String msg = String.format("Service component host %s not found, " +
"unable to transition to failed state.", componentName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
index 5638439..3be66d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
@@ -67,7 +67,7 @@ public class Stage {
*/
public static final String INTERNAL_HOSTNAME = "_internal_ambari";
- private static Logger LOG = LoggerFactory.getLogger(Stage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Stage.class);
private final long requestId;
private String clusterName;
private long clusterId = -1L;
@@ -853,7 +853,7 @@ public class Stage {
summaryTaskTimeoutForHost += commandTimeout;
} else {
LOG.error("Execution command has no timeout parameter" +
- command.toString());
+ command);
}
}
if (summaryTaskTimeoutForHost > stageTimeout) {
@@ -936,7 +936,7 @@ public class Stage {
builder.append("HOST: ").append(hostRoleCommand.getHostName()).append(" :\n");
builder.append(hostRoleCommand.getExecutionCommandWrapper().getJson());
builder.append("\n");
- builder.append(hostRoleCommand.toString());
+ builder.append(hostRoleCommand);
builder.append("\n");
}
builder.append("STAGE DESCRIPTION END\n");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
index 02f2dc8..1e13e25 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
@@ -38,7 +38,7 @@ import com.google.inject.Singleton;
@Singleton
public class ActionQueue {
- private static Logger LOG = LoggerFactory.getLogger(ActionQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionQueue.class);
private static HashSet<String> EMPTY_HOST_LIST = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
index 5ff1564..8457bb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Singleton;
@@ -34,7 +34,7 @@ import com.google.inject.Singleton;
@Singleton
public class AgentRequests {
- private static Log LOG = LogFactory.getLog(HeartbeatMonitor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HeartbeatMonitor.class);
private final Map<String, Map<String, Boolean>> requiresExecCmdDetails = new HashMap<>();
private final Object _lock = new Object();
@@ -60,7 +60,7 @@ public class AgentRequests {
Map<String, Boolean> perHostRequiresExecCmdDetails = getPerHostRequiresExecCmdDetails(host);
if (perHostRequiresExecCmdDetails != null && perHostRequiresExecCmdDetails.containsKey(component)) {
- LOG.debug("Sending exec command details for " + component);
+ LOG.debug("Sending exec command details for {}", component);
return perHostRequiresExecCmdDetails.get(component);
}
@@ -81,6 +81,6 @@ public class AgentRequests {
@Override
public String toString() {
- return new StringBuilder().append("requiresExecCmdDetails: ").append(requiresExecCmdDetails.toString()).toString();
+ return new StringBuilder().append("requiresExecCmdDetails: ").append(requiresExecCmdDetails).toString();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 17b89b7..3a650ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -29,8 +29,8 @@ import org.apache.ambari.annotations.ExperimentalFeature;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.annotations.SerializedName;
@@ -41,7 +41,7 @@ import com.google.gson.annotations.SerializedName;
*/
public class ExecutionCommand extends AgentCommand {
- private static Log LOG = LogFactory.getLog(ExecutionCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionCommand.class);
public ExecutionCommand() {
super(AgentCommandType.EXECUTION_COMMAND);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index fc6e7a7..89ec963 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -155,10 +155,7 @@ public class HeartBeatHandler {
return createRegisterCommand();
}
- LOG.debug("Received heartbeat from host"
- + ", hostname=" + hostname
- + ", currentResponseId=" + currentResponseId
- + ", receivedResponseId=" + heartbeat.getResponseId());
+ LOG.debug("Received heartbeat from host, hostname={}, currentResponseId={}, receivedResponseId={}", hostname, currentResponseId, heartbeat.getResponseId());
if (heartbeat.getResponseId() == currentResponseId - 1) {
HeartBeatResponse heartBeatResponse = hostResponses.get(hostname);
@@ -249,7 +246,7 @@ public class HeartBeatHandler {
response.setRecoveryConfig(rc);
if (response.getRecoveryConfig() != null) {
- LOG.info("Recovery configuration set to {}", response.getRecoveryConfig().toString());
+ LOG.info("Recovery configuration set to {}", response.getRecoveryConfig());
}
}
}
@@ -268,7 +265,7 @@ public class HeartBeatHandler {
protected void processRecoveryReport(RecoveryReport recoveryReport, String hostname) throws AmbariException {
- LOG.debug("Received recovery report: " + recoveryReport.toString());
+ LOG.debug("Received recovery report: {}", recoveryReport);
Host host = clusterFsm.getHost(hostname);
host.setRecoveryReport(recoveryReport);
}
@@ -283,7 +280,7 @@ public class HeartBeatHandler {
for (AgentCommand ac : cmds) {
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending command string = " + StageUtils.jaxbToString(ac));
+ LOG.debug("Sending command string = {}", StageUtils.jaxbToString(ac));
}
} catch (Exception e) {
throw new AmbariException("Could not get jaxb string for command", e);
@@ -446,7 +443,7 @@ public class HeartBeatHandler {
response.setAgentConfig(config.getAgentConfigsMap());
if(response.getAgentConfig() != null) {
- LOG.debug("Agent configuration map set to " + response.getAgentConfig());
+ LOG.debug("Agent configuration map set to {}", response.getAgentConfig());
}
/*
@@ -464,7 +461,7 @@ public class HeartBeatHandler {
response.setRecoveryConfig(rc);
if(response.getRecoveryConfig() != null) {
- LOG.info("Recovery configuration set to " + response.getRecoveryConfig().toString());
+ LOG.info("Recovery configuration set to " + response.getRecoveryConfig());
}
}
@@ -495,7 +492,7 @@ public class HeartBeatHandler {
}
if(actionQueue.hasPendingTask(hostname)) {
- LOG.debug("Host " + hostname + " has pending tasks");
+ LOG.debug("Host {} has pending tasks", hostname);
response.setHasPendingTasks(true);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index 6d65bbd..d83a5d1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -58,8 +58,8 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.state.host.HostHeartbeatLostEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Injector;
@@ -67,7 +67,7 @@ import com.google.inject.Injector;
* Monitors the node state and heartbeats.
*/
public class HeartbeatMonitor implements Runnable {
- private static Log LOG = LogFactory.getLog(HeartbeatMonitor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HeartbeatMonitor.class);
private Clusters clusters;
private ActionQueue actionQueue;
private ActionManager actionManager;
@@ -120,8 +120,7 @@ public class HeartbeatMonitor implements Runnable {
while (shouldRun) {
try {
doWork();
- LOG.trace("Putting monitor to sleep for " + threadWakeupInterval + " " +
- "milliseconds");
+ LOG.trace("Putting monitor to sleep for {} milliseconds", threadWakeupInterval);
Thread.sleep(threadWakeupInterval);
} catch (InterruptedException ex) {
LOG.warn("Scheduler thread is interrupted going to stop", ex);
@@ -193,8 +192,7 @@ public class HeartbeatMonitor implements Runnable {
// Get status of service components
List<StatusCommand> cmds = generateStatusCommands(hostname);
- LOG.trace("Generated " + cmds.size() + " status commands for host: " +
- hostname);
+ LOG.trace("Generated {} status commands for host: {}", cmds.size(), hostname);
if (cmds.isEmpty()) {
// Nothing to do
} else {
@@ -352,7 +350,7 @@ public class HeartbeatMonitor implements Runnable {
if (statusCmd.getPayloadLevel() == StatusCommand.StatusCommandPayload.EXECUTION_COMMAND) {
ExecutionCommand ec = ambariManagementController.getExecutionCommand(cluster, sch, RoleCommand.START);
statusCmd.setExecutionCommand(ec);
- LOG.debug(componentName + " has more payload for execution command");
+ LOG.debug("{} has more payload for execution command", componentName);
}
return statusCmd;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
----------------------------------------------------------------------
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 d6ae260..a08abab 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
@@ -374,7 +374,7 @@ public class HeartbeatProcessor extends AbstractService{
}
}
- LOG.debug("Received command report: " + report);
+ LOG.debug("Received command report: {}", report);
// get this locally; don't touch the database
Host host = clusterFsm.getHost(hostname);
@@ -463,7 +463,7 @@ public class HeartbeatProcessor extends AbstractService{
throw new AmbariException("Invalid command report, service: " + service);
}
if (actionMetadata.getActions(service.toLowerCase()).contains(report.getRole())) {
- LOG.debug(report.getRole() + " is an action - skip component lookup");
+ LOG.debug("{} is an action - skip component lookup", report.getRole());
} else {
try {
Service svc = cl.getService(service);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
index ce16f14..6673bc7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
@@ -378,7 +378,7 @@ public class HostInfo {
}
StringBuilder ret = new StringBuilder();
for (DiskInfo diskInfo : mounts) {
- ret.append("(").append(diskInfo.toString()).append(")");
+ ret.append("(").append(diskInfo).append(")");
}
return ret.toString();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
index ec41a7b..83fef03 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
@@ -115,7 +115,7 @@ public class Register {
"prefix=" + prefix + "\n";
if (hardwareProfile != null)
- ret = ret + "hardwareprofile=" + this.hardwareProfile.toString();
+ ret = ret + "hardwareprofile=" + this.hardwareProfile;
return ret;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
index 0690f7b..a332459 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
@@ -38,8 +38,8 @@ import org.apache.ambari.server.agent.Register;
import org.apache.ambari.server.agent.RegistrationResponse;
import org.apache.ambari.server.agent.RegistrationStatus;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -52,7 +52,7 @@ import com.google.inject.Inject;
@Path("/")
public class AgentResource {
private static HeartBeatHandler hh;
- private static Log LOG = LogFactory.getLog(AgentResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AgentResource.class);
@Inject
public static void init(HeartBeatHandler instance) {
@@ -92,7 +92,7 @@ public class AgentResource {
RegistrationResponse response = null;
try {
response = hh.handleRegistration(message);
- LOG.debug("Sending registration response " + response);
+ LOG.debug("Sending registration response {}", response);
} catch (AmbariException ex) {
response = new RegistrationResponse();
response.setResponseId(-1);
@@ -122,14 +122,14 @@ public class AgentResource {
public HeartBeatResponse heartbeat(HeartBeat message)
throws WebApplicationException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received Heartbeat message " + message);
+ LOG.debug("Received Heartbeat message {}", message);
}
HeartBeatResponse heartBeatResponse;
try {
heartBeatResponse = hh.handleHeartBeat(message);
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending heartbeat response with response id " + heartBeatResponse.getResponseId());
- LOG.debug("Response details " + heartBeatResponse);
+ LOG.debug("Sending heartbeat response with response id {}", heartBeatResponse.getResponseId());
+ LOG.debug("Response details {}", heartBeatResponse);
}
} catch (Exception e) {
LOG.warn("Error in HeartBeat", e);
@@ -155,7 +155,7 @@ public class AgentResource {
public ComponentsResponse components(
@PathParam("clusterName") String clusterName) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received Components request for cluster " + clusterName);
+ LOG.debug("Received Components request for cluster {}", clusterName);
}
ComponentsResponse componentsResponse;
@@ -164,7 +164,7 @@ public class AgentResource {
componentsResponse = hh.handleComponents(clusterName);
if (LOG.isDebugEnabled()) {
LOG.debug("Sending components response");
- LOG.debug("Response details " + componentsResponse);
+ LOG.debug("Response details {}", componentsResponse);
}
} catch (Exception e) {
LOG.warn("Error in Components", e);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
index 1387ded..25fd143 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
@@ -523,7 +523,7 @@ public class QueryImpl implements Query, ResourceInstance {
NoSuchParentResourceException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Executing resource query: " + request + " where " + predicate);
+ LOG.debug("Executing resource query: {} where {}", request, predicate);
}
QueryResponse queryResponse = clusterController.getResources(type, request, predicate);
@@ -534,7 +534,7 @@ public class QueryImpl implements Query, ResourceInstance {
// NoSuchResourceException (404 response) for an empty query result
if(!isCollectionResource()) {
throw new NoSuchResourceException(
- "The requested resource doesn't exist: " + type.toString() + " not found where " + predicate + ".");
+ "The requested resource doesn't exist: " + type + " not found where " + predicate + ".");
}
}
return queryResponse;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
index e5e1aa6..1bf22b1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
@@ -40,8 +40,8 @@ import org.apache.ambari.server.bootstrap.BSResponse;
import org.apache.ambari.server.bootstrap.BootStrapImpl;
import org.apache.ambari.server.bootstrap.BootStrapStatus;
import org.apache.ambari.server.bootstrap.SshHostInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -49,7 +49,7 @@ import com.google.inject.Inject;
public class BootStrapResource {
private static BootStrapImpl bsImpl;
- private static Log LOG = LogFactory.getLog(BootStrapResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapResource.class);
@Inject
public static void init(BootStrapImpl instance) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 76694d4..8965683 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -496,10 +496,7 @@ public class AmbariMetaInfo {
public String getComponentToService(String stackName, String version,
String componentName) throws AmbariException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Looking for service for component"
- + ", stackName=" + stackName
- + ", stackVersion=" + version
- + ", componentName=" + componentName);
+ LOG.debug("Looking for service for component, stackName={}, stackVersion={}, componentName={}", stackName, version, componentName);
}
Map<String, ServiceInfo> services = getServices(stackName, version);
String retService = null;
@@ -839,13 +836,12 @@ public class AmbariMetaInfo {
private void getCustomActionDefinitions(File customActionDefinitionRoot) throws JAXBException, AmbariException {
if (customActionDefinitionRoot != null) {
- LOG.debug("Loading custom action definitions from "
- + customActionDefinitionRoot.getAbsolutePath());
+ LOG.debug("Loading custom action definitions from {}", customActionDefinitionRoot.getAbsolutePath());
if (customActionDefinitionRoot.exists() && customActionDefinitionRoot.isDirectory()) {
adManager.readCustomActionDefinitions(customActionDefinitionRoot);
} else {
- LOG.debug("No action definitions found at " + customActionDefinitionRoot.getAbsolutePath());
+ LOG.debug("No action definitions found at {}", customActionDefinitionRoot.getAbsolutePath());
}
}
}
@@ -1002,7 +998,7 @@ public class AmbariMetaInfo {
ServiceInfo svc = getService(stackName, stackVersion, serviceName);
if (null == svc.getMetricsFile() || !svc.getMetricsFile().exists()) {
- LOG.debug("Metrics file for " + stackName + "/" + stackVersion + "/" + serviceName + " not found.");
+ LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, serviceName);
return null;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
index bf4d930..ebfc62e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
@@ -134,7 +134,7 @@ public abstract class BaseRequest implements Request {
@Override
public Result process() {
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling API Request: '" + getURI() + "'");
+ LOG.debug("Handling API Request: '{}'", getURI());
}
Result result;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
index 6a6b413..59b1d4e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
@@ -35,15 +35,15 @@ import javax.xml.bind.JAXBException;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@Path("/persist/")
public class PersistKeyValueService {
private static PersistKeyValueImpl persistKeyVal;
- private static Log LOG = LogFactory.getLog(PersistKeyValueService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistKeyValueService.class);
@Inject
public static void init(PersistKeyValueImpl instance) {
@@ -56,7 +56,7 @@ public class PersistKeyValueService {
public Response update(String keyValues)
throws WebApplicationException, InvalidStateTransitionException,
JAXBException, IOException {
- LOG.debug("Received message from UI " + keyValues);
+ LOG.debug("Received message from UI {}", keyValues);
Map<String, String> keyValuesMap = StageUtils.fromJson(keyValues, Map.class);
/* Call into the heartbeat handler */
@@ -70,14 +70,14 @@ public class PersistKeyValueService {
@PUT
@Produces("text/plain")
public String store(String values) throws IOException, JAXBException {
- LOG.debug("Received message from UI " + values);
+ LOG.debug("Received message from UI {}", values);
Collection<String> valueCollection = StageUtils.fromJson(values, Collection.class);
Collection<String> keys = new ArrayList<>(valueCollection.size());
for (String s : valueCollection) {
keys.add(persistKeyVal.put(s));
}
String stringRet = StageUtils.jaxbToString(keys);
- LOG.debug("Returning " + stringRet);
+ LOG.debug("Returning {}", stringRet);
return stringRet;
}
@@ -85,7 +85,7 @@ public class PersistKeyValueService {
@Produces("text/plain")
@Path("{keyName}")
public String getKey( @PathParam("keyName") String keyName) {
- LOG.debug("Looking for keyName " + keyName);
+ LOG.debug("Looking for keyName {}", keyName);
return persistKeyVal.getValue(keyName);
}
@@ -94,7 +94,7 @@ public class PersistKeyValueService {
public String getAllKeyValues() throws JAXBException, IOException {
Map<String, String> ret = persistKeyVal.getAllKeyValues();
String stringRet = StageUtils.jaxbToString(ret);
- LOG.debug("Returning " + stringRet);
+ LOG.debug("Returning {}", stringRet);
return stringRet;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
index b835345..504bf04 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
@@ -98,7 +98,7 @@ public class JsonRequestBodyParser implements RequestBodyParser {
} catch (IOException e) {
if (LOG.isDebugEnabled()) {
LOG.debug("Caught exception parsing msg body.");
- LOG.debug("Message Body: " + body, e);
+ LOG.debug("Message Body: {}", body, e);
}
throw new BodyParseException(e);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
index 7731b22..273c0ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
@@ -53,7 +53,7 @@ import com.google.inject.Singleton;
@Singleton
public class StackAdvisorBlueprintProcessor {
- private static Logger LOG = LoggerFactory.getLogger(StackAdvisorBlueprintProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StackAdvisorBlueprintProcessor.class);
private static StackAdvisorHelper stackAdvisorHelper;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index ed27697..c2895d9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
@@ -51,14 +51,14 @@ import org.apache.ambari.server.utils.DateUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
import org.codehaus.jackson.node.TextNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Parent for all commands.
@@ -71,7 +71,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
*/
private Class<T> type;
- protected static Log LOG = LogFactory.getLog(StackAdvisorCommand.class);
+ protected static Logger LOG = LoggerFactory.getLogger(StackAdvisorCommand.class);
private static final String GET_HOSTS_INFO_URI = "/api/v1/hosts"
+ "?fields=Hosts/*&Hosts/host_name.in(%s)";
@@ -374,7 +374,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
String hostsJSON = (String) response.getEntity();
if (LOG.isDebugEnabled()) {
- LOG.debug("Hosts information: " + hostsJSON);
+ LOG.debug("Hosts information: {}", hostsJSON);
}
Collection<String> unregistered = getUnregisteredHosts(hostsJSON, request.getHosts());
@@ -428,7 +428,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
String servicesJSON = (String) response.getEntity();
if (LOG.isDebugEnabled()) {
- LOG.debug("Services information: " + servicesJSON);
+ LOG.debug("Services information: {}", servicesJSON);
}
return servicesJSON;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
index 3b9c58d..df67ecc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
@@ -28,8 +28,8 @@ import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.view.ViewDataMigrationUtility;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.view.migration.ViewDataMigrationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,7 +46,7 @@ public class ViewDataMigrationService extends BaseService {
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(ViewDataMigrationService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewDataMigrationService.class);
/**
* The singleton view registry.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
index fa8a22a..b72ca20 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.ambari.server.utils.Closeables;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Runnable class that gets the hoststatus output by looking at the files
@@ -39,7 +39,7 @@ class BSHostStatusCollector {
private List<BSHostStatus> hostStatus;
public static final String logFileFilter = ".log";
public static final String doneFileFilter = ".done";
- private static Log LOG = LogFactory.getLog(BSHostStatusCollector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BSHostStatusCollector.class);
private List<String> hosts;
@@ -68,11 +68,7 @@ class BSHostStatusCollector {
done = new File(requestIdDir, host + doneFileFilter);
log = new File(requestIdDir, host + logFileFilter);
if (LOG.isDebugEnabled()) {
- LOG.debug("Polling bootstrap status for host"
- + ", requestDir=" + requestIdDir
- + ", host=" + host
- + ", doneFileExists=" + done.exists()
- + ", logFileExists=" + log.exists());
+ LOG.debug("Polling bootstrap status for host, requestDir={}, host={}, doneFileExists={}, logFileExists={}", requestIdDir, host, done.exists(), log.exists());
}
if (!done.exists()) {
status.setStatus("RUNNING");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
index c2909a6..c7976ee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
@@ -32,15 +32,15 @@ import java.util.concurrent.TimeUnit;
import org.apache.ambari.server.bootstrap.BootStrapStatus.BSStat;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author ncole
*
*/
class BSRunner extends Thread {
- private static Log LOG = LogFactory.getLog(BSRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BSRunner.class);
private static final String DEFAULT_USER = "root";
private static final String DEFAULT_SSHPORT = "22";
@@ -212,8 +212,7 @@ class BSRunner extends Thread {
if (LOG.isDebugEnabled()) {
// FIXME needs to be removed later
// security hole
- LOG.debug("Using ssh key=\""
- + sshHostInfo.getSshKey() + "\"");
+ LOG.debug("Using ssh key=\"{}\"", sshHostInfo.getSshKey());
}
String password = sshHostInfo.getPassword();
@@ -338,8 +337,7 @@ class BSRunner extends Thread {
pendingHosts = true;
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Whether hosts status yet to be updated, pending="
- + pendingHosts);
+ LOG.debug("Whether hosts status yet to be updated, pending={}", pendingHosts);
}
if (!pendingHosts) {
break;
@@ -441,7 +439,7 @@ class BSRunner extends Thread {
}
}
} catch (FileNotFoundException ex) {
- LOG.error(ex);
+ LOG.error(ex.toString());
} finally {
if (setupAgentDoneWriter != null) {
setupAgentDoneWriter.close();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
index c166326..bfe40ea 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.bootstrap.BSResponse.BSRunStat;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -44,7 +44,7 @@ public class BootStrapImpl {
private String masterHostname;
long timeout;
- private static Log LOG = LogFactory.getLog(BootStrapImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapImpl.class);
/* Monotonically increasing requestid for the bootstrap api to query on */
int requestId = 0;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
index 4fdecc7..ff3aeda 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
@@ -43,7 +43,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class UpgradeCheckRegistry {
- private static Logger LOG = LoggerFactory.getLogger(UpgradeCheckRegistry.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeCheckRegistry.class);
/**
* The list of upgrade checks to run through.
@@ -97,7 +97,7 @@ public class UpgradeCheckRegistry {
try {
URL url = jar.toURI().toURL();
urls.add(url);
- LOG.debug("Adding service check jar to classpath: {}", url.toString());
+ LOG.debug("Adding service check jar to classpath: {}", url);
}
catch (Exception e) {
LOG.error("Failed to add service check jar to classpath: {}", jar.getAbsolutePath(), e);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 2fa965e..1b0e0e0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -331,12 +331,9 @@ public class AmbariActionExecutionHelper {
);
if (! ignoredHosts.isEmpty()) {
- LOG.debug("Hosts to ignore: {}.", StringUtils.join(ignoredHosts, ", "));
- LOG.debug("Ignoring action for hosts due to maintenance state." +
- "Ignored hosts =" + ignoredHosts + ", component="
- + componentName + ", service=" + serviceName
- + ", cluster=" + cluster.getClusterName() + ", " +
- "actionName=" + actionContext.getActionName());
+ LOG.debug("Hosts to ignore: {}.", ignoredHosts);
+ LOG.debug("Ignoring action for hosts due to maintenance state.Ignored hosts ={}, component={}, service={}, cluster={}, actionName={}",
+ ignoredHosts, componentName, serviceName, cluster.getClusterName(), actionContext.getActionName());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
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 554ae1d..9083a66 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
@@ -851,7 +851,7 @@ public class AmbariCustomCommandExecutionHelper {
cloneSet.retainAll(includedHosts);
if (cloneSet.size() > 0) {
throw new AmbariException("Same host cannot be specified for inclusion " +
- "as well as exclusion. Hosts: " + cloneSet.toString());
+ "as well as exclusion. Hosts: " + cloneSet);
}
Service service = cluster.getService(serviceName);
@@ -1111,10 +1111,8 @@ public class AmbariCustomCommandExecutionHelper {
List<RequestResourceFilter> resourceFilters = actionExecutionContext.getResourceFilters();
for (RequestResourceFilter resourceFilter : resourceFilters) {
- LOG.debug("Received a command execution request"
- + ", clusterName=" + actionExecutionContext.getClusterName()
- + ", serviceName=" + resourceFilter.getServiceName()
- + ", request=" + actionExecutionContext.toString());
+ LOG.debug("Received a command execution request, clusterName={}, serviceName={}, request={}",
+ actionExecutionContext.getClusterName(), resourceFilter.getServiceName(), actionExecutionContext);
String actionName = actionExecutionContext.getActionName();
if (actionName.contains(SERVICE_CHECK_COMMAND_NAME)) {
@@ -1554,7 +1552,7 @@ public class AmbariCustomCommandExecutionHelper {
return service.getServiceComponent(resourceFilter.getComponentName());
} catch (Exception e) {
- LOG.debug(String.format( "Unknown error appears during getting service component: %s", e.getMessage()));
+ LOG.debug("Unknown error appears during getting service component: {}", e.getMessage());
}
return null;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
index 9645a36..e134f6d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
@@ -144,7 +144,7 @@ public class AmbariHandlerList extends HandlerCollection implements ViewInstance
try {
ClassLoader viewClassLoader = viewEntity.getClassLoader();
if (viewClassLoader == null) {
- LOG.debug("No class loader associated with view " + viewEntity.getName() + ".");
+ LOG.debug("No class loader associated with view {}.", viewEntity.getName());
} else {
Thread.currentThread().setContextClassLoader(viewClassLoader);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
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 2a9d6c9..eb64030 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
@@ -435,9 +435,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createCluster request"
- + ", clusterName=" + request.getClusterName()
- + ", request=" + request);
+ LOG.debug("Received a createCluster request, clusterName={}, request={}", request.getClusterName(), request);
}
if (request.getStackVersion() == null
@@ -533,12 +531,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createHostComponent request"
- + ", clusterName=" + request.getClusterName()
- + ", serviceName=" + request.getServiceName()
- + ", componentName=" + request.getComponentName()
- + ", hostname=" + request.getHostname()
- + ", request=" + request);
+ LOG.debug("Received a createHostComponent request, clusterName={}, serviceName={}, componentName={}, hostname={}, request={}",
+ request.getClusterName(), request.getServiceName(), request.getComponentName(), request.getHostname(), request);
}
if (!hostComponentNames.containsKey(request.getClusterName())) {
@@ -604,17 +598,12 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
clusters.getClustersForHost(request.getHostname());
boolean validCluster = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Looking to match host to cluster"
- + ", hostnameViaReg=" + host.getHostName()
- + ", hostname=" + request.getHostname()
- + ", clusterName=" + request.getClusterName()
- + ", hostClusterMapCount=" + mappedClusters.size());
+ LOG.debug("Looking to match host to cluster, hostnameViaReg={}, hostname={}, clusterName={}, hostClusterMapCount={}",
+ host.getHostName(), request.getHostname(), request.getClusterName(), mappedClusters.size());
}
for (Cluster mappedCluster : mappedClusters) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Host belongs to cluster"
- + ", hostname=" + request.getHostname()
- + ", clusterName=" + mappedCluster.getClusterName());
+ LOG.debug("Host belongs to cluster, hostname={}, clusterName={}", request.getHostname(), mappedCluster.getClusterName());
}
if (mappedCluster.getClusterName().equals(
request.getClusterName())) {
@@ -660,7 +649,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
} else {
msg = "Attempted to create host_component's which already exist: ";
}
- throw new DuplicateResourceException(msg + names.toString());
+ throw new DuplicateResourceException(msg + names);
}
// set restartRequired flag for monitoring services
@@ -1000,7 +989,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throws AmbariException {
final Set<MemberResponse> responses = new HashSet<>();
for (MemberRequest request: requests) {
- LOG.debug("Received a getMembers request, " + request.toString());
+ LOG.debug("Received a getMembers request, {}", request);
final Group group = users.getGroup(request.getGroupName());
if (null == group) {
if (requests.size() == 1) {
@@ -1065,10 +1054,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Set<ClusterResponse> response = new HashSet<>();
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a getClusters request"
- + ", clusterName=" + request.getClusterName()
- + ", clusterId=" + request.getClusterId()
- + ", stackInfo=" + request.getStackVersion());
+ LOG.debug("Received a getClusters request, clusterName={}, clusterId={}, stackInfo={}",
+ request.getClusterName(), request.getClusterId(), request.getStackVersion());
}
Cluster singleCluster = null;
@@ -1128,7 +1115,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
StringBuilder builder = new StringBuilder();
if (LOG.isDebugEnabled()) {
clusters.debugDump(builder);
- LOG.debug("Cluster State for cluster " + builder.toString());
+ LOG.debug("Cluster State for cluster {}", builder);
}
return response;
}
@@ -1652,7 +1639,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
ServiceConfigVersionResponse serviceConfigVersionResponse = null;
if (request.getDesiredConfig() != null && request.getServiceConfigVersionRequest() != null) {
- String msg = "Unable to set desired configs and rollback at same time, request = " + request.toString();
+ String msg = "Unable to set desired configs and rollback at same time, request = " + request;
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
@@ -1660,7 +1647,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
// set the new name of the cluster if change is requested
if (!cluster.getClusterName().equals(request.getClusterName())) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received cluster name change request from " + cluster.getClusterName() + " to " + request.getClusterName());
+ LOG.debug("Received cluster name change request from {} to {}", cluster.getClusterName(), request.getClusterName());
}
if(!AuthorizationHelper.isAuthorized(ResourceType.AMBARI, null, EnumSet.of(RoleAuthorization.AMBARI_RENAME_CLUSTER))) {
@@ -2466,11 +2453,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
String repoInfo = customCommandExecutionHelper.getRepoInfo(cluster, component, host);
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending repo information to agent"
- + ", hostname=" + scHost.getHostName()
- + ", clusterName=" + clusterName
- + ", stackInfo=" + stackId.getStackId()
- + ", repoInfo=" + repoInfo);
+ LOG.debug("Sending repo information to agent, hostname={}, clusterName={}, stackInfo={}, repoInfo={}",
+ scHost.getHostName(), clusterName, stackId.getStackId(), repoInfo);
}
Map<String, String> hostParams = new TreeMap<>();
@@ -2979,15 +2963,12 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
+ ", newDesiredState=" + newState);
default:
throw new AmbariException("Unsupported state change operation"
- + ", newState=" + newState.toString());
+ + ", newState=" + newState);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Create a new host action"
- + ", requestId=" + requestStages.getId()
- + ", componentName=" + scHost.getServiceComponentName()
- + ", hostname=" + scHost.getHostName()
- + ", roleCommand=" + roleCommand.name());
+ LOG.debug("Create a new host action, requestId={}, componentName={}, hostname={}, roleCommand={}",
+ requestStages.getId(), scHost.getServiceComponentName(), scHost.getHostName(), roleCommand.name());
}
// any targeted information
@@ -3663,8 +3644,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
for (UserRequest r : requests) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a delete user request"
- + ", username=" + r.getUsername());
+ LOG.debug("Received a delete user request, username={}", r.getUsername());
}
User u = users.getAnyUser(r.getUsername());
if (null != u) {
@@ -3676,7 +3656,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
@Override
public void deleteGroups(Set<GroupRequest> requests) throws AmbariException {
for (GroupRequest request: requests) {
- LOG.debug("Received a delete group request, groupname=" + request.getGroupName());
+ LOG.debug("Received a delete group request, groupname={}", request.getGroupName());
final Group group = users.getGroup(request.getGroupName());
if (group != null) {
users.removeGroup(group);
@@ -3687,7 +3667,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
@Override
public void deleteMembers(java.util.Set<MemberRequest> requests) throws AmbariException {
for (MemberRequest request : requests) {
- LOG.debug("Received a delete member request, " + request);
+ LOG.debug("Received a delete member request, {}", request);
users.removeMemberFromGroup(request.getGroupName(), request.getUserName());
}
}
@@ -3839,8 +3819,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
for (UserRequest r : requests) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a getUsers request"
- + ", userRequest=" + r.toString());
+ LOG.debug("Received a getUsers request, userRequest={}", r);
}
String requestedUsername = r.getUsername();
@@ -3894,7 +3873,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throws AmbariException {
final Set<GroupResponse> responses = new HashSet<>();
for (GroupRequest request: requests) {
- LOG.debug("Received a getGroups request, groupRequest=" + request.toString());
+ LOG.debug("Received a getGroups request, groupRequest={}", request);
// get them all
if (null == request.getGroupName()) {
for (Group group: users.getAllGroups()) {
@@ -3993,10 +3972,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
);
- LOG.debug("Ignoring hosts when selecting available hosts for action" +
- " due to maintenance state." +
- "Ignored hosts =" + ignoredHosts + ", cluster="
- + cluster.getClusterName() + ", service=" + service.getName());
+ LOG.debug("Ignoring hosts when selecting available hosts for action due to maintenance state.Ignored hosts ={}, cluster={}, service={}",
+ ignoredHosts, cluster.getClusterName(), service.getName());
}
/**
@@ -4066,7 +4043,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
LOG.info("Received action execution request"
+ ", clusterName=" + actionRequest.getClusterName()
- + ", request=" + actionRequest.toString());
+ + ", request=" + actionRequest);
}
ActionExecutionContext actionExecContext = getActionExecutionContext(actionRequest);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 2f799b7..aeba739 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -170,7 +170,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer;
@Singleton
public class AmbariServer {
public static final String VIEWS_URL_PATTERN = "/api/v1/views/*";
- private static Logger LOG = LoggerFactory.getLogger(AmbariServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariServer.class);
/**
* The thread name prefix for threads handling agent requests.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 4fa2362..f3c2ec8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -181,7 +181,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
* Used for injection purposes.
*/
public class ControllerModule extends AbstractModule {
- private static Logger LOG = LoggerFactory.getLogger(ControllerModule.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ControllerModule.class);
private static final String AMBARI_PACKAGE = "org.apache.ambari.server";
private final Configuration configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
index f7f20cc..322596e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
@@ -174,7 +174,7 @@ public abstract class AbstractPropertyProvider extends BaseProvider implements P
}
}
if(LOG.isDebugEnabled()) {
- LOG.debug("Retrieved Cluster Ids = " + clusterResId.toString());
+ LOG.debug("Retrieved Cluster Ids = {}", clusterResId);
}
return clusterResId;
}
@@ -204,7 +204,7 @@ public abstract class AbstractPropertyProvider extends BaseProvider implements P
}
if(LOG.isDebugEnabled()) {
- LOG.debug("Retrieved cluster's Resource Id = " + clusterResIds + ", Resource Type = " + resType);
+ LOG.debug("Retrieved cluster's Resource Id = {}, Resource Type = {}", clusterResIds, resType);
}
Iterator<Long> clusResIdsItr = clusterResIds.iterator();
while (clusResIdsItr.hasNext()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 8975837..0e4f3f4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -409,7 +409,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
if (!vipHostConfigPresent) {
currentCollectorHost = metricsCollectorHAManager.getCollectorHost(clusterName);
}
- LOG.debug("Cluster Metrics Vip Host : " + clusterMetricserverVipHost);
+ LOG.debug("Cluster Metrics Vip Host : {}", clusterMetricserverVipHost);
return (clusterMetricserverVipHost != null) ? clusterMetricserverVipHost : currentCollectorHost;
}
@@ -560,7 +560,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
}
}
- LOG.debug("jmxPortMap -> " + jmxPortMap);
+ LOG.debug("jmxPortMap -> {}", jmxPortMap);
ConcurrentMap<String, String> hostJmxPorts = clusterJmxPorts.get(hostName);
if (hostJmxPorts == null) {
@@ -1018,7 +1018,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
}
}
value = postProcessPropertyValue(propName, value, evaluatedProperties, null);
- LOG.debug("PROPERTY -> key: " + propName + ", " + "value: " + value);
+ LOG.debug("PROPERTY -> key: {}, value: {}", propName, value);
mConfigs.put(entry.getKey(), value);
@@ -1152,15 +1152,12 @@ public abstract class AbstractProviderModule implements ProviderModule,
jmxProtocolString = "http";
}
if (jmxProtocolString == null) {
- LOG.debug("Detected JMX protocol is null for clusterName = " + clusterName +
- ", componentName = " + componentName);
- LOG.debug("Defaulting JMX to HTTP protocol for for clusterName = " + clusterName +
- ", componentName = " + componentName);
+ LOG.debug("Detected JMX protocol is null for clusterName = {}, componentName = {}", clusterName, componentName);
+ LOG.debug("Defaulting JMX to HTTP protocol for for clusterName = {}, componentName = {}", clusterName, componentName);
jmxProtocolString = "http";
}
if (LOG.isDebugEnabled()) {
- LOG.debug("JMXProtocol = " + jmxProtocolString + ", for clusterName=" + clusterName +
- ", componentName = " + componentName);
+ LOG.debug("JMXProtocol = {}, for clusterName={}, componentName = {}", jmxProtocolString, clusterName, componentName);
}
clusterJmxProtocolMap.put(mapKey, jmxProtocolString);
return jmxProtocolString;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
index db9842a..4e618e7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
@@ -100,8 +100,7 @@ public class ActionResourceProvider extends AbstractControllerResourceProvider {
if (predicate != null) {
for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
ActionRequest actionReq = getRequest(propertyMap);
- LOG.debug("Received a get request for Action with"
- + ", actionName = " + actionReq.getActionName());
+ LOG.debug("Received a get request for Action with, actionName = {}", actionReq.getActionName());
requests.add(actionReq);
}
} else {