From d84fd5c541e3f1bcae794d04db9448c3d86e8149 Mon Sep 17 00:00:00 2001
From: Sailesh Mukil <smukil@netflix.com>
Date: Tue, 8 Oct 2019 14:11:56 -0400
Subject: [PATCH] Move debug messages from DEBUG to WARN

Some log messages should be showed as warnings and not as DEBUG
messages.
---
 .../dyno/queues/redis/RedisDynoQueue.java     | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java b/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
index ad54b9a..f71e0ac 100644
--- a/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
+++ b/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
@@ -372,36 +372,28 @@ public Message popWithMsgIdHelper(String messageId, String targetShard) {
             Long exists = nonQuorumConn.zrank(queueShardName, messageId);
             // If we get back a null type, then the element doesn't exist.
             if (exists == null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Cannot find the message with ID {}", messageId);
-                }
+                logger.warn("Cannot find the message with ID {}", messageId);
                 monitor.misses.increment();
                 return null;
             }
 
             String json = quorumConn.hget(messageStoreKey, messageId);
             if (json == null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Cannot get the message payload for {}", messageId);
-                }
+                logger.warn("Cannot get the message payload for {}", messageId);
                 monitor.misses.increment();
                 return null;
             }
 
             long added = quorumConn.zadd(unackShardName, unackScore, messageId, zParams);
             if (added == 0) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("cannot add {} to the unack shard {}", messageId, unackShardName);
-                }
+                logger.warn("cannot add {} to the unack shard {}", messageId, unackShardName);
                 monitor.misses.increment();
                 return null;
             }
 
             long removed = quorumConn.zrem(queueShardName, messageId);
             if (removed == 0) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("cannot remove {} from the queue shard ", queueName, messageId);
-                }
+                logger.warn("cannot remove {} from the queue shard ", queueName, messageId);
                 monitor.misses.increment();
                 return null;
             }
@@ -541,27 +533,21 @@ private List<Message> _pop(String shard, int messageCount,
 
             long added = quorumConn.zadd(unackShardName, unackScore, msgId, zParams);
             if(added == 0){
-                if (logger.isDebugEnabled()) {
-                    logger.debug("cannot add {} to the unack shard {}", msgId, unackShardName);
-                }
+                logger.warn("cannot add {} to the unack shard {}", msgId, unackShardName);
                 monitor.misses.increment();
                 continue;
             }
 
             long removed = quorumConn.zrem(queueShardName, msgId);
             if (removed == 0) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("cannot remove {} from the queue shard {}", msgId, queueShardName);
-                }
+                logger.warn("cannot remove {} from the queue shard {}", msgId, queueShardName);
                 monitor.misses.increment();
                 continue;
             }
 
             String json = quorumConn.hget(messageStoreKey, msgId);
             if (json == null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Cannot get the message payload for {}", msgId);
-                }
+                logger.warn("Cannot get the message payload for {}", msgId);
                 monitor.misses.increment();
                 continue;
             }
@@ -810,9 +796,7 @@ public Message get(String messageId) {
             return execute("get", messageStoreKey, () -> {
                 String json = quorumConn.hget(messageStoreKey, messageId);
                 if (json == null) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Cannot get the message payload " + messageId);
-                    }
+                    logger.warn("Cannot get the message payload " + messageId);
                     return null;
                 }
 
@@ -906,7 +890,7 @@ public void processUnacks() {
                 Set<Tuple> unacks = nonQuorumConn.zrangeByScoreWithScores(unackShardName, 0, now, 0, batchSize);
 
                 if (unacks.size() > 0) {
-                    logger.info("processUnacks: Adding " + unacks.size() + " messages back to shard of queue: " + unackShardName);
+                    logger.info("processUnacks: Attempting to add " + unacks.size() + " messages back to shard of queue: " + unackShardName);
                 }
 
                 for (Tuple unack : unacks) {
@@ -926,7 +910,9 @@ public void processUnacks() {
                     if (added_back > 0 && removed_from_unack > 0) ++num_moved_back;
                 }
 
-                logger.info("processUnacks: Moved back " + num_moved_back + " items. Got rid of " + num_stale + " stale items.");
+                if (num_moved_back > 0 || num_stale > 0) {
+                    logger.info("processUnacks: Moved back " + num_moved_back + " items. Got rid of " + num_stale + " stale items.");
+                }
                 return null;
             });