Repository: incubator-samza Updated Branches: refs/heads/0.7.0 b715cf0cc -> 31f4ccc71
SAMZA-275: Fix logging of exception stack traces at debug level. Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/31f4ccc7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/31f4ccc7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/31f4ccc7 Branch: refs/heads/0.7.0 Commit: 31f4ccc71620abe212a0c987b077d5c5f4d2c2ca Parents: b715cf0 Author: Martin Kleppmann <[email protected]> Authored: Thu Jun 5 22:14:58 2014 +0100 Committer: Martin Kleppmann <[email protected]> Committed: Thu Jun 5 22:19:46 2014 +0100 ---------------------------------------------------------------------- .../scala/org/apache/samza/container/SamzaContainer.scala | 4 ++-- .../scala/org/apache/samza/serializers/CheckpointSerde.scala | 2 +- .../samza/checkpoint/kafka/KafkaCheckpointManager.scala | 8 ++++---- .../scala/org/apache/samza/system/kafka/BrokerProxy.scala | 2 +- .../org/apache/samza/system/kafka/KafkaSystemAdmin.scala | 2 +- .../org/apache/samza/system/kafka/KafkaSystemConsumer.scala | 4 ++-- .../org/apache/samza/system/kafka/KafkaSystemProducer.scala | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala ---------------------------------------------------------------------- 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 c7c6bcc..3c19f23 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 @@ -134,7 +134,7 @@ object SamzaContainer extends Logging { } catch { case e: Exception => info("Failed to create a consumer for %s, so skipping." format systemName) - debug(e) + debug("Exception detail:", e) (systemName, null) } }) @@ -151,7 +151,7 @@ object SamzaContainer extends Logging { } catch { case e: Exception => info("Failed to create a producer for %s, so skipping." format systemName) - debug(e) + debug("Exception detail:", e) (systemName, null) } } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala b/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala index 2ed8d7d..3d0a484 100644 --- a/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala +++ b/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala @@ -41,7 +41,7 @@ class CheckpointSerde extends Serde[Checkpoint] with Logging { } catch { case e : Exception => warn("Exception while deserializing checkpoint: " + e) - debug(e) + debug("Exception detail:", e) null } } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala index fed6eee..d5f7957 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala @@ -86,7 +86,7 @@ class KafkaCheckpointManager( (exception, loop) => { warn("Failed to send checkpoint %s for partition %s: %s. Retrying." format (checkpoint, partition, exception)) - debug(exception) + debug("Exception detail:", exception) if (producer != null) { producer.close } @@ -184,7 +184,7 @@ class KafkaCheckpointManager( case e: KafkaCheckpointException => throw e case e: Exception => warn("While trying to read last checkpoint for topic %s and partition %s: %s. Retrying." format (checkpointTopic, partition, e)) - debug(e) + debug("Exception detail:", e) } } ).getOrElse(throw new SamzaException("Failed to get checkpoint for partition %s" format partition.getPartitionId)) @@ -237,7 +237,7 @@ class KafkaCheckpointManager( loop.done case e: Exception => warn("Failed to create topic %s: %s. Retrying." format (checkpointTopic, e)) - debug(e) + debug("Exception detail:", e) } } ) @@ -265,7 +265,7 @@ class KafkaCheckpointManager( case e: KafkaCheckpointException => throw e case e: Exception => warn("While trying to validate topic %s: %s. Retrying." format (checkpointTopic, e)) - debug(e) + debug("Exception detail:", e) } } ) http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala index e08791f..561e990 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala @@ -152,7 +152,7 @@ class BrokerProxy( (exception, loop) => { warn("Restarting consumer due to %s. Turn on debugging to get a full stack trace." format exception) - debug(exception) + debug("Exception detail:", exception) reconnect = true }) } catch { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala index 0f72a79..662df99 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala @@ -183,7 +183,7 @@ class KafkaSystemAdmin( (exception, loop) => { warn("Unable to fetch last offsets for streams %s due to %s. Retrying." format (streams, exception)) - debug(exception) + debug("Exception detail:", exception) } ).getOrElse(throw new SamzaException("Failed to get system stream metadata")) } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala index 1825fbb..55cfc2d 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala @@ -164,9 +164,9 @@ private[kafka] class KafkaSystemConsumer( loop.done }, - (loop, exception) => { + (exception, loop) => { warn("While refreshing brokers for %s: %s. Retrying." format (tpToRefresh.head, exception)) - debug(exception) + debug("Exception detail:", exception) }) } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/31f4ccc7/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala index 2de8cea..5fb7a20 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala @@ -93,7 +93,7 @@ class KafkaSystemProducer( (exception, loop) => { warn("Triggering a reconnect for %s because connection failed: %s" format (systemName, exception)) - debug(exception) + debug("Exception detail: ", exception) metrics.reconnects.inc if (producer != null) {
