You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by pm...@apache.org on 2023/04/10 17:34:50 UTC
[samza] branch master updated: Removed unnecessary logging for configs (#1664)
This is an automated email from the ASF dual-hosted git repository.
pmaheshwari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git
The following commit(s) were added to refs/heads/master by this push:
new 815dfc638 Removed unnecessary logging for configs (#1664)
815dfc638 is described below
commit 815dfc6386d02316b63595c734b0eb19eb0c1e5d
Author: Prateek Maheshwari <pr...@utexas.edu>
AuthorDate: Mon Apr 10 10:34:44 2023 -0700
Removed unnecessary logging for configs (#1664)
---
.../coordinator/metadatastore/CoordinatorStreamStore.java | 7 ++++---
.../src/main/java/org/apache/samza/execution/JobPlanner.java | 10 ----------
.../main/scala/org/apache/samza/container/SamzaContainer.scala | 6 +++---
.../src/main/scala/org/apache/samza/metrics/JmxServer.scala | 4 ++--
samza-core/src/main/scala/org/apache/samza/util/Logging.scala | 9 ---------
5 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java b/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java
index 6bb638b07..4d18100f5 100644
--- a/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java
+++ b/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java
@@ -106,7 +106,8 @@ public class CoordinatorStreamStore implements MetadataStore {
@Override
public void init() {
if (isInitialized.compareAndSet(false, true)) {
- LOG.info("Starting the coordinator stream system consumer with config: {}.", config);
+ LOG.info("Starting the coordinator stream system consumer.");
+ LOG.debug("Starting the coordinator stream system consumer with config: {}", config);
registerConsumer();
systemConsumer.start();
systemProducer.register(SOURCE);
@@ -114,7 +115,7 @@ public class CoordinatorStreamStore implements MetadataStore {
iterator = new SystemStreamPartitionIterator(systemConsumer, coordinatorSystemStreamPartition);
readMessagesFromCoordinatorStream();
} else {
- LOG.info("Store had already been initialized. Skipping.", coordinatorSystemStreamPartition);
+ LOG.info("Store had already been initialized. Skipping.");
}
}
@@ -169,7 +170,7 @@ public class CoordinatorStreamStore implements MetadataStore {
@Override
public void close() {
try {
- LOG.info("Stopping the coordinator stream system consumer.", config);
+ LOG.info("Stopping the coordinator stream system consumer.");
systemAdmin.stop();
systemProducer.stop();
systemConsumer.stop();
diff --git a/samza-core/src/main/java/org/apache/samza/execution/JobPlanner.java b/samza-core/src/main/java/org/apache/samza/execution/JobPlanner.java
index 68423c639..2b2fc7e3b 100644
--- a/samza-core/src/main/java/org/apache/samza/execution/JobPlanner.java
+++ b/samza-core/src/main/java/org/apache/samza/execution/JobPlanner.java
@@ -208,23 +208,13 @@ public abstract class JobPlanner {
throw new SamzaException("Samza app name should not be null, Please set either app.name (preferred) or job.name (deprecated) in configs");
}
- if (userConfigs.containsKey(JobConfig.JOB_ID)) {
- LOG.warn("{} is a deprecated configuration, use app.id instead.", JobConfig.JOB_ID);
- }
-
- if (userConfigs.containsKey(JobConfig.JOB_NAME)) {
- LOG.warn("{} is a deprecated configuration, use use app.name instead.", JobConfig.JOB_NAME);
- }
-
if (userConfigs.containsKey(ApplicationConfig.APP_NAME)) {
String appName = userConfigs.get(ApplicationConfig.APP_NAME);
- LOG.info("app.name is defined, generating job.name equal to app.name value: {}", appName);
generatedConfig.put(JobConfig.JOB_NAME, appName);
}
if (userConfigs.containsKey(ApplicationConfig.APP_ID)) {
String appId = userConfigs.get(ApplicationConfig.APP_ID);
- LOG.info("app.id is defined, generating job.id equal to app.name value: {}", appId);
generatedConfig.put(JobConfig.JOB_ID, appId);
}
diff --git a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
index 3d3847470..647e0d163 100644
--- a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
+++ b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala
@@ -154,10 +154,10 @@ object SamzaContainer extends Logging {
info("Setting up Samza container: %s" format containerName)
- startupLog("Samza container PID: %s" format containerPID)
+ info("Samza container PID: %s" format containerPID)
println("Container PID: %s" format containerPID)
- startupLog("Using configuration: %s" format config)
- startupLog("Using container model: %s" format containerModel)
+ info("Using configuration: %s" format config)
+ info("Using container model: %s" format containerModel)
val samzaContainerMetrics = new SamzaContainerMetrics(containerName, registry)
val systemProducersMetrics = new SystemProducersMetrics(registry)
diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala b/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala
index 54a5de097..4e112a349 100644
--- a/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala
+++ b/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala
@@ -99,8 +99,8 @@ class JmxServer(requestedPort: Int) extends Logging {
}
jmxServer.start
- startupLog("Started " + toString)
- startupLog("If you are tunneling, you might want to try " + toString.replaceAll("localhost", hostname))
+ info("Started " + toString)
+ info("If you are tunneling, you might want to try " + toString.replaceAll("localhost", hostname))
println(s"JMX Server: ${toString.replaceAll("localhost", hostname)}")
/**
diff --git a/samza-core/src/main/scala/org/apache/samza/util/Logging.scala b/samza-core/src/main/scala/org/apache/samza/util/Logging.scala
index c7ffbeeac..345f43365 100644
--- a/samza-core/src/main/scala/org/apache/samza/util/Logging.scala
+++ b/samza-core/src/main/scala/org/apache/samza/util/Logging.scala
@@ -25,15 +25,6 @@ trait Logging {
val loggerName = this.getClass.getName
lazy val logger = LoggerFactory.getLogger(loggerName)
- val startupLoggerName = "STARTUP_LOGGER"
- lazy val startupLogger = LoggerFactory.getLogger(startupLoggerName)
-
- def startupLog(message: => Any): Unit = {
- logger.info(message.toString)
- startupLogger.info(message.toString)
- }
-
-
def trace(message: => Any): Unit = {
if (logger.isTraceEnabled()) {
logger.trace(message.toString)