From aeb53ea31d8a90041dc56699c251dd4f0314dc65 Mon Sep 17 00:00:00 2001
From: Kamil Braun <kbraun@scylladb.com>
Date: Thu, 11 Jan 2024 15:42:48 +0100
Subject: [PATCH] raft topology: don't include null ID in exclude_nodes

Observed with newly added logs:
```
raft topology - executing global topology command barrier_and_drain, excluded nodes: {00000000-0000-0000-0000-000000000000}
```
---
 service/storage_service.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/service/storage_service.cc b/service/storage_service.cc
index e5303c5c6a..30786e20ea 100644
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -1563,7 +1563,9 @@ class topology_coordinator : public endpoint_lifecycle_subscriber {
 
     std::unordered_set<raft::server_id> get_excluded_nodes(raft::server_id id, const std::optional<topology_request>& req, const std::optional<request_param>& req_param) {
         auto exclude_nodes = parse_ignore_nodes(req_param);
-        exclude_nodes.insert(parse_replaced_node(req_param));
+        if (auto replaced_node = parse_replaced_node(req_param)) {
+            exclude_nodes.insert(replaced_node);
+        }
         if (req && *req == topology_request::remove) {
             exclude_nodes.insert(id);
         }