diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5d578c55c..cfb5422b8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -35,6 +35,8 @@ Changed - Cartridge doesn't use ``ddl-ee`` instead of ``ddl``. +- uuids in issues replaces with instance names and uris. + ------------------------------------------------------------------------------- [2.12.2] - 2024-06-24 ------------------------------------------------------------------------------- diff --git a/cartridge/issues.lua b/cartridge/issues.lua index b277260a1..942333f77 100644 --- a/cartridge/issues.lua +++ b/cartridge/issues.lua @@ -334,7 +334,7 @@ local function list_on_instance(opts) "Raft leader idle is %f on %s. ".. "Is raft leader alive and connection is healthy?", leader_idle, - instance_uuid + describe(self_uri) ) } table.insert(ret, issue) @@ -538,7 +538,7 @@ local function list_on_instance(opts) replicaset_uuid = replicaset_uuid, message = string.format( 'Disk error on instance %s. This issue stays until restart', - instance_uuid + describe(self_uri) ), }) end diff --git a/test/integration/issues_test.lua b/test/integration/issues_test.lua index d7082b7df..66c0f5f11 100644 --- a/test/integration/issues_test.lua +++ b/test/integration/issues_test.lua @@ -446,9 +446,8 @@ function g.test_election_leader_high_idle() { level = 'warning', topic = 'raft', - message = ("Raft leader idle is 10.000000 on %s. ".. - "Is raft leader alive and connection is healthy?"): - format(g.master.instance_uuid), + message = "Raft leader idle is 10.000000 on localhost:13301 (master). ".. + "Is raft leader alive and connection is healthy?", instance_uuid = g.master.instance_uuid, replicaset_uuid = g.master.replicaset_uuid, },