Merge pull request #448 from rystsov/fix-idempotent-init-rpc

fixes skewed merge of id_allocator
redpanda-data · Jan 22, 2021 · bc1c80a · bc1c80a
2 parents 230f3fd + 3f00ef2
commit bc1c80a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/v/cluster/controller.h b/src/v/cluster/controller.h
@@ -40,7 +40,7 @@ class controller {
       ss::sharded<shard_table>& st,
       ss::sharded<storage::api>& storage);
 
-    model::node_id self() { return _raft0->self(); }
+    model::node_id self() { return _raft0->self().id(); }
     ss::sharded<topics_frontend>& get_topics_frontend() { return _tp_frontend; }
     ss::sharded<members_manager>& get_members_manager() {
         return _members_manager;

diff --git a/src/v/raft/id_allocator_stm.h b/src/v/raft/id_allocator_stm.h
@@ -92,7 +92,7 @@ class id_allocator_stm final : public raft::state_machine {
 private:
     struct sequence_id {
         model::run_id run_id;
-        model::node_id node_id;
+        raft::vnode node_id;
         int64_t tick;
 
         bool operator==(const sequence_id& other) const {