Refactor[BMQ,MQB,CI]: various improvements

.github/workflows/ext/check_license.py

@@ -24,16 +24,17 @@
 import glob
 from pathlib import Path
 import re
+from typing import List
 
 
-def load_license_template(path: str) -> list[re.Pattern]:
+def load_license_template(path: str) -> List[re.Pattern]:
     with open(path, "r") as f:
         lines = f.readlines()
 
     return [re.compile(line) for line in lines]
 
 
-def check_license(fpath: str, expressions: list[re.Pattern]) -> bool:
+def check_license(fpath: str, expressions: List[re.Pattern]) -> bool:
     with open(fpath, "r") as f:
         ln = f.readline()
         if ln.startswith("#!"):  # skip possible shebang at the beginning of the file

docker/cluster/config/bmqbrkrcfg.json

@@ -15,7 +15,6 @@
                 "BMQ*:INFO:green",
                 "MQB*:INFO:green",
                 "SIM*:INFO:gray",
-                "DMC*:INFO:yellow",
                 "BAEA.PERFORMANCEMONITOR:INFO:white"
             ],
             "syslog": {

docker/single-node/config/bmqbrkrcfg.json

@@ -15,7 +15,6 @@
                 "BMQ*:INFO:green",
                 "MQB*:INFO:green",
                 "SIM*:INFO:gray",
-                "DMC*:INFO:yellow",
                 "BAEA.PERFORMANCEMONITOR:INFO:white"
             ],
             "syslog": {

src/applications/bmqbrkr/etc/bmqbrkrcfg.json

@@ -15,7 +15,6 @@
                 "BMQ*:INFO:green",
                 "MQB*:INFO:green",
                 "SIM*:INFO:gray",
-                "DMC*:INFO:yellow",
                 "BAEA.PERFORMANCEMONITOR:INFO:white"
             ],
             "syslog": {

src/applications/bmqtool/m_bmqtool_application.cpp

@@ -160,7 +160,6 @@ void Application::setUpLog()
     // logged, so the console observer should print any logs it receives.
 
     d_consoleObserver.setLogFormat(logFormat)
-        .setCategoryColor("DMC*", "gray")
         .setCategoryColor("BMQ*", "green")
         .setCategoryColor("MQB*", "green")
         .setCategoryColor("APPLICATION", "yellow")

src/groups/bmq/bmqu/bmqu_stringutil.cpp

@@ -32,24 +32,24 @@ namespace {
 /// Rearrange characters in place within the contiguous sequence indicated
 /// by the specified `[begin, end)` such that all repeated runs of any
 /// characters belonging to the set indicated by the specified
-/// `[whitelistBegin, whitelistEnd)` are reduced to one appearance of the
-/// character. Return a pointer to the new end of the sequence.  Note that
+/// `[allowlistBegin, allowlistEnd)` are reduced to one appearance of the
+/// character.  Return a pointer to the new end of the sequence.  Note that
 /// this function is similar to `bsl::remove_if` with a special predicate.
 char* removeIfPrecededBySame(char*       begin,
                              char*       end,
-                             const char* whitelistBegin,
-                             const char* whitelistEnd)
+                             const char* allowlistBegin,
+                             const char* allowlistEnd)
 {
-    bsl::bitset<UCHAR_MAX + 1> whitelist;
-    for (const char* iter = whitelistBegin; iter != whitelistEnd; ++iter) {
-        whitelist[static_cast<unsigned char>(*iter)] = true;
+    bsl::bitset<UCHAR_MAX + 1> allowlist;
+    for (const char* iter = allowlistBegin; iter != allowlistEnd; ++iter) {
+        allowlist[static_cast<unsigned char>(*iter)] = true;
     }
 
     char* result = begin;
     for (; begin != end; ++begin) {
-        // If this is *not* a repeated item from the whitelist, then copy it
+        // If this is *not* a repeated item from the allowlist, then copy it
         // into its final place.
-        if (!whitelist[static_cast<unsigned char>(*begin)] ||
+        if (!allowlist[static_cast<unsigned char>(*begin)] ||
             *begin != *(begin - 1)) {
             *result++ = *begin;
         }

src/groups/mqb/mqba/mqba_sessionnegotiator.cpp

@@ -23,9 +23,9 @@
 // mode waits for incoming connection; when one is established, it will
 // schedule a read with a short timeout ('k_NEGOTIATION_READTIMEOUT' below).
 // If a valid negotiation message is received, it will reply with its identity
-// and create a session.  If either the read timesout, the received negotiation
-// message is invalid, or the received identity is marked as blacklisted, the
-// negotiation will fail and the connection will be closed.
+// and create a session.  If either the read times out, the received
+// negotiation message is invalid, or the received identity is marked as not
+// allowed, the negotiation will fail and the connection will be closed.
 //
 /// Session creation logic
 ///----------------------

src/integration-tests/test_admin_client.py

@@ -64,7 +64,7 @@ def post_n_msgs(
     for _ in range(task.num):
         res = producer.post(task.uri, payload=["msg"], wait_ack=True)
         assert Client.e_SUCCESS == res
-    producer.close(task.uri)
+    producer.close(task.uri, succeed=True)
 
     if posted is not None:
         if task.uri in posted:

src/python/blazingmq/dev/configurator/__init__.py

@@ -382,7 +382,6 @@ class Proto:
                         "BMQ*:INFO:green",
                         "MQB*:INFO:green",
                         "SIM*:INFO:gray",
-                        "DMC*:INFO:yellow",
                         "BAEA.PERFORMANCEMONITOR:INFO:white",
                     ],
                     syslog=mqbcfg.SyslogConfig(

src/python/blazingmq/dev/it/cluster.py

@@ -35,6 +35,8 @@
 
 logger = logging.getLogger(__name__)
 
+CORE_PATTERN_PATH = "/proc/sys/kernel/core_pattern"
+
 
 def _match_broker(broker, **kw):
     datacenter = kw.get("datacenter", None)
@@ -205,29 +207,7 @@ def stop(self):
 
         self.last_known_leader = None
         bad_exit = False
-        cores_dir = None
-
-        if self.copy_cores is not None:
-            try:
-                with open("/proc/sys/kernel/core_pattern") as core_pattern_file:
-                    pattern = core_pattern_file.readline().strip()
-                    if "%p" in pattern:
-                        cores_dir = Path(pattern).parent
-                        if not cores_dir.is_absolute():
-                            self._logger.warning(
-                                "core pattern '%s' is not an absolute path, cores will not be saved",
-                                pattern,
-                            )
-                            cores_dir = None
-                    else:
-                        self._logger.warning(
-                            "core pattern '%s' does not contain process id, cores will not be saved",
-                            pattern,
-                        )
-            except FileExistsError:
-                self._logger.warning(
-                    "/proc/sys/kernel/core_pattern does not exist, cores will not be saved"
-                )
+        cores_dir = None if self.copy_cores is None else self._find_cores_dir()
 
         for process in processes:
             process.wait()
@@ -685,6 +665,31 @@ def reconfigure_domain(
     ###########################################################################
     # Internals
 
+    def _find_cores_dir(self) -> Optional[Path]:
+        try:
+            with open(CORE_PATTERN_PATH) as core_pattern_file:
+                pattern = core_pattern_file.readline().strip()
+                if "%p" in pattern:
+                    cores_dir = Path(pattern).parent
+                    if cores_dir.is_absolute():
+                        return cores_dir
+
+                    self._logger.warning(
+                        "core pattern '%s' is not an absolute path, cores will not be saved",
+                        pattern,
+                    )
+                else:
+                    self._logger.warning(
+                        "core pattern '%s' does not contain process id, cores will not be saved",
+                        pattern,
+                    )
+        except FileNotFoundError:
+            self._logger.warning(
+                "%s does not exist, cores will not be saved", CORE_PATTERN_PATH
+            )
+
+        return None
+
     def _start_broker(self, broker: cfg.Broker, array, cluster_name):
         if broker.name in self._processes:
             raise RuntimeError(f'node "{broker.name}" is already running')

src/python/blazingmq/dev/it/fixtures.py

@@ -37,8 +37,7 @@
 import tempfile
 from enum import IntEnum
 from pathlib import Path
-from typing import Callable, List, Optional, Tuple
-from collections.abc import Generator, Iterator
+from typing import Callable, List, Optional, Tuple, Iterator
 import psutil
 
 import pytest

src/python/blazingmq/dev/it/util.py

@@ -160,7 +160,7 @@ def close(self, *args, **kwargs):
 _T = TypeVar("_T")
 
 
-class ListContextManager(list[_T]):
+class ListContextManager(List[_T]):
     def __enter__(self):
         return self