Merge pull request #10490 from vbotbuildovich/backport-10480-v23.1.x-870

[v23.1.x] compression: avoid optimizing away logger registration
redpanda-data · May 10, 2023 · 8d0082c · 8d0082c
2 parents 2fdbf25 + 28652fe
commit 8d0082c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 38 deletions.
diff --git a/src/v/compression/CMakeLists.txt b/src/v/compression/CMakeLists.txt
@@ -14,7 +14,6 @@ v_cc_library(
     "compression.cc"
     "stream_zstd.cc"
     "async_stream_zstd.cc"
-    "logger.cc"
     "snappy_standard_compressor.cc"
     "internal/snappy_java_compressor.cc"
     "internal/lz4_frame_compressor.cc"

diff --git a/src/v/compression/async_stream_zstd.cc b/src/v/compression/async_stream_zstd.cc
@@ -11,7 +11,6 @@
 
 #include "bytes/bytes.h"
 #include "bytes/details/io_allocation_size.h"
-#include "compression/logger.h"
 #include "likely.h"
 #include "units.h"
 #include "vassert.h"

diff --git a/src/v/compression/compression.cc b/src/v/compression/compression.cc
@@ -14,8 +14,23 @@
 #include "compression/internal/snappy_java_compressor.h"
 #include "compression/internal/zstd_compressor.h"
 #include "vassert.h"
+#include "vlog.h"
 
 namespace compression {
+
+/*
+ * There are no users of this, but we need to make sure it isn't compiled away
+ * in release mode so that it still shows up in the registered loggers list
+ * which rpk needs to be in sync with.
+ *
+ * Putting it here instead of in its own compilation unit seemed to have tricked
+ * the optimizer. Added a log statement below too, just for good measure.
+ *
+ * As soon as rpk supports logger name discovery via admin api this can be fully
+ * removed.
+ */
+ss::logger complog{"compression"};
+
 iobuf compressor::compress(const iobuf& io, type t) {
     switch (t) {
     case type::none:
@@ -29,6 +44,7 @@ iobuf compressor::compress(const iobuf& io, type t) {
     case type::zstd:
         return internal::zstd_compressor::compress(io);
     default:
+        vlog(complog.error, "Cannot compress type {}", t);
         vassert(false, "Cannot compress type {}", t);
     }
 }

diff --git a/src/v/compression/internal/snappy_java_compressor.cc b/src/v/compression/internal/snappy_java_compressor.cc
@@ -12,7 +12,6 @@
 #include "bytes/bytes.h"
 #include "bytes/details/io_iterator_consumer.h"
 #include "bytes/iobuf.h"
-#include "compression/logger.h"
 #include "compression/snappy_standard_compressor.h"
 #include "likely.h"
 #include "vlog.h"

diff --git a/src/v/compression/logger.cc b/src/v/compression/logger.cc
diff --git a/src/v/compression/logger.h b/src/v/compression/logger.h
diff --git a/src/v/compression/stream_zstd.cc b/src/v/compression/stream_zstd.cc
@@ -11,7 +11,6 @@
 
 #include "bytes/bytes.h"
 #include "bytes/details/io_allocation_size.h"
-#include "compression/logger.h"
 #include "likely.h"
 #include "units.h"
 #include "vassert.h"