Merge pull request ClickHouse#78792 from evillique/fix-assert-s3queue

Fix assert in S3Queue

Author: tavplubix

src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp

@@ -19,6 +19,7 @@
 #include <Common/randomSeed.h>
 #include <Common/DNSResolver.h>
 #include <shared_mutex>
+#include <Core/ServerUUID.h>
 
 
 namespace ProfileEvents
@@ -505,17 +506,22 @@ namespace
     {
         std::string hostname;
         std::string table_id;
+        std::string server_uuid;
+
+        size_t version = 1;
 
         bool operator ==(const Info & other) const
         {
-            return hostname == other.hostname && table_id == other.table_id;
+            return hostname == other.hostname && table_id == other.table_id
+                && (version == 0 || other.version == 0 || server_uuid == other.server_uuid);
         }
 
         static Info create(const StorageID & storage_id)
         {
             Info self;
             self.hostname = DNSResolver::instance().getHostName();
             self.table_id = storage_id.hasUUID() ? toString(storage_id.uuid) : storage_id.getFullTableName();
+            self.server_uuid = toString(ServerUUID::get());
             return self;
         }
 
@@ -524,27 +530,30 @@ namespace
             SipHash hash;
             hash.update(hostname);
             hash.update(table_id);
+            hash.update(server_uuid);
             return hash.get128();
         }
 
         std::string serialize() const
         {
             WriteBufferFromOwnString buf;
-            size_t version = 0;
             buf << version << "\n";
             buf << hostname << "\n";
             buf << table_id << "\n";
+            if (version >= 1)
+                buf << server_uuid << "\n";
             return buf.str();
         }
 
         static Info deserialize(const std::string & str)
         {
             ReadBufferFromString buf(str);
             Info info;
-            size_t version;
-            buf >> version >> "\n";
+            buf >> info.version >> "\n";
             buf >> info.hostname >> "\n";
             buf >> info.table_id >> "\n";
+            if (info.version >= 1)
+                buf >> info.server_uuid >> "\n";
             return info;
         }
     };

tests/integration/test_storage_s3_queue/test_4.py

@@ -582,7 +582,10 @@ def test_registry(started_cluster):
     ).strip()
     assert uuid1 in str(registry)
 
-    expected = [f"0\\ninstance\\n{uuid1}\\n", f"0\\ninstance2\\n{uuid1}\\n"]
+    server_uuid_1 = node1.query("SELECT serverUUID()").strip()
+    server_uuid_2 = node2.query("SELECT serverUUID()").strip()
+
+    expected = [f"1\\ninstance\\n{uuid1}\\n{server_uuid_1}\\n", f"1\\ninstance2\\n{uuid1}\\n{server_uuid_2}\\n"]
 
     for elem in expected:
         assert elem in str(registry)
@@ -637,10 +640,10 @@ def get_count():
     assert uuid2 in str(registry)
 
     expected = [
-        f"0\\ninstance\\n{uuid1}\\n",
-        f"0\\ninstance2\\n{uuid1}\\n",
-        f"0\\ninstance\\n{uuid2}\\n",
-        f"0\\ninstance2\\n{uuid2}\\n",
+        f"1\\ninstance\\n{uuid1}\\n{server_uuid_1}\\n",
+        f"1\\ninstance2\\n{uuid1}\\n{server_uuid_2}\\n",
+        f"1\\ninstance\\n{uuid2}\\n{server_uuid_1}\\n",
+        f"1\\ninstance2\\n{uuid2}\\n{server_uuid_2}\\n",
     ]
 
     for elem in expected:
@@ -663,8 +666,8 @@ def get_count():
     assert uuid2 not in str(registry)
 
     expected = [
-        f"0\\ninstance\\n{uuid1}\\n",
-        f"0\\ninstance2\\n{uuid1}\\n",
+        f"1\\ninstance\\n{uuid1}\\n{server_uuid_1}\\n",
+        f"1\\ninstance2\\n{uuid1}\\n{server_uuid_2}\\n",
     ]
 
     for elem in expected: