Merge pull request #5481 from rystsov/feature-fix

Align feature manager's logical versions with v22.1.5
redpanda-data · Jul 21, 2022 · 1007d11 · 1007d11
2 parents f5e34d4 + 668f0e9
commit 1007d11
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/v/cluster/feature_table.cc b/src/v/cluster/feature_table.cc
@@ -26,12 +26,12 @@ std::string_view to_string_view(feature f) {
         return "maintenance_mode";
     case feature::mtls_authentication:
         return "mtls_authentication";
+    case feature::rm_stm_kafka_cache:
+        return "rm_stm_kafka_cache";
     case feature::serde_raft_0:
         return "serde_raft_0";
     case feature::license:
         return "license";
-    case feature::rm_stm_kafka_cache:
-        return "rm_stm_kafka_cache";
     case feature::test_alpha:
         return "__test_alpha";
     }

diff --git a/src/v/cluster/feature_table.h b/src/v/cluster/feature_table.h
@@ -25,9 +25,9 @@ enum class feature : std::uint64_t {
     consumer_offsets = 0x2,
     maintenance_mode = 0x4,
     mtls_authentication = 0x8,
-    serde_raft_0 = 0x10,
-    license = 0x20,
-    rm_stm_kafka_cache = 0x40,
+    rm_stm_kafka_cache = 0x10,
+    serde_raft_0 = 0x20,
+    license = 0x40,
 
     // Dummy features for testing only
     test_alpha = uint64_t(1) << 63,
@@ -106,20 +106,20 @@ constexpr static std::array feature_schema{
     feature_spec::prepare_policy::always},
   feature_spec{
     cluster_version{4},
-    "serde_raft_0",
-    feature::serde_raft_0,
+    "rm_stm_kafka_cache",
+    feature::rm_stm_kafka_cache,
     feature_spec::available_policy::always,
     feature_spec::prepare_policy::always},
   feature_spec{
-    cluster_version{4},
-    "license",
-    feature::license,
+    cluster_version{5},
+    "serde_raft_0",
+    feature::serde_raft_0,
     feature_spec::available_policy::always,
     feature_spec::prepare_policy::always},
   feature_spec{
     cluster_version{5},
-    "rm_stm_kafka_cache",
-    feature::rm_stm_kafka_cache,
+    "license",
+    feature::license,
     feature_spec::available_policy::always,
     feature_spec::prepare_policy::always},
   feature_spec{