Merge pull request #14392 from vbotbuildovich/backport-pr-14375-v23.2…

….x-906 [v23.2.x] c/partition_allocator: make `_highest_group` updates monotonic
redpanda-data · Oct 24, 2023 · 07caacd · 07caacd
2 parents 892fc80 + 4edaf7b
commit 07caacd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/v/cluster/scheduling/allocation_state.cc b/src/v/cluster/scheduling/allocation_state.cc
@@ -24,8 +24,6 @@ void allocation_state::rollback(
             remove_allocation(bs, domain);
             remove_final_count(bs, domain);
         }
-        // rollback for each assignment as the groups are distinct
-        _highest_group = raft::group_id(_highest_group() - 1);
     }
 }
 

diff --git a/src/v/cluster/scheduling/partition_allocator.h b/src/v/cluster/scheduling/partition_allocator.h
@@ -133,7 +133,6 @@ class partition_allocator {
     ss::future<> apply_snapshot(const controller_snapshot&);
 
 private:
-    // reverts not only allocations but group_ids as well
     class intermediate_allocation {
     public:
         intermediate_allocation(

diff --git a/src/v/cluster/tests/partition_allocator_tests.cc b/src/v/cluster/tests/partition_allocator_tests.cc
@@ -212,7 +212,7 @@ FIXTURE_TEST(partial_assignment, partition_allocator_fixture) {
 
     BOOST_REQUIRE_EQUAL(3, max_capacity());
     BOOST_REQUIRE_EQUAL(
-      allocator.state().last_group_id()(), max_partitions_in_cluster - 1);
+      allocator.state().last_group_id()(), max_partitions_in_cluster);
 }
 FIXTURE_TEST(max_deallocation, partition_allocator_fixture) {
     register_node(0, 3);