Rename alarm label

Signed-off-by: Aleksandr Ivanov <[email protected]>
alexander-e1off · Sep 13, 2024 · 763563f · 763563f
1 parent b972874
commit 763563f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp b/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp
@@ -1744,21 +1744,20 @@ void RootQueueEngine::logAlarmCb(
                                          storage);
     mqbcmd::HumanPrinter::print(out, result);
 
-    if (!head) {
-        return;  // RETURN
-    }
-
-    // Print the current head of the queue
-    out << mwcu::PrintUtil::newlineAndIndent(level, spacesPerLevel)
-        << "Current head of the queue:\n";
+    if (head) {
+        // Print the current head of the queue
+        out << mwcu::PrintUtil::newlineAndIndent(level, spacesPerLevel)
+            << "Current head of the queue:\n";
 
-    mqbs::StoragePrintUtil::listMessage(&result.makeMessage(), storage, *head);
+        mqbs::StoragePrintUtil::listMessage(&result.makeMessage(),
+                                            storage,
+                                            *head);
 
-    mqbcmd::HumanPrinter::print(out, result);
-    out << "\n";
+        mqbcmd::HumanPrinter::print(out, result);
+        out << "\n";
+    }
 
-    MWCTSK_ALARMLOG_ALARM("ROOT_QUEUE_ENGINE")
-        << out.str() << MWCTSK_ALARMLOG_END;
+    MWCTSK_ALARMLOG_ALARM("QUEUE_STUCK") << out.str() << MWCTSK_ALARMLOG_END;
 }
 
 void RootQueueEngine::afterAppIdRegistered(

diff --git a/src/integration-tests/test_alarms.py b/src/integration-tests/test_alarms.py
@@ -56,7 +56,7 @@ def test_no_alarms_for_a_slow_queue(cluster: Cluster):
     time.sleep(4)
 
     # First, test the alarm
-    assert leader.alarms("QUEUE_CONSUMER_MONITOR", 1)
+    assert leader.alarms("QUEUE_STUCK", 1)
     leader.drain()
 
     # Then test no alarm while consumer1 slowly confirms
@@ -74,4 +74,4 @@ def test_no_alarms_for_a_slow_queue(cluster: Cluster):
     )
 
     time.sleep(1)
-    assert not leader.alarms("QUEUE_CONSUMER_MONITOR", 1)
+    assert not leader.alarms("QUEUE_STUCK", 1)
diff --git a/src/integration-tests/test_reconfigure_domains.py b/src/integration-tests/test_reconfigure_domains.py
@@ -254,7 +254,7 @@ def test_reconfigure_max_idle_time(self, multi_node: Cluster):
 
         # Sleep for long enough to trigger an alarm.
         time.sleep(1.5)
-        assert leader.alarms("QUEUE_CONSUMER_MONITOR", 1)
+        assert leader.alarms("QUEUE_STUCK", 1)
 
         # Confirm all messages in the queue.
         self.reader.confirm(URI_PRIORITY_1, "+2", succeed=True)
@@ -277,7 +277,7 @@ def test_reconfigure_max_idle_time(self, multi_node: Cluster):
         self.reader.confirm(URI_PRIORITY_1, "+2", succeed=True)
 
         # Ensure that no alarm was issued.
-        assert not leader.alarms("QUEUE_CONSUMER_MONITOR", 1)
+        assert not leader.alarms("QUEUE_STUCK", 1)
 
     @tweak.domain.message_ttl(1)
     def test_reconfigure_message_ttl(self, multi_node: Cluster):