Skip to content

Commit 355df43

Browse files
committed
recovery: add logging of recovered buckets
This patch introduces logging of buckets' ids which were recovered during recovery stage of storage. Part of #212 NO_DOC=bugfix
1 parent 2ac2997 commit 355df43

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

test/storage-luatest/storage_1_1_1_test.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ rebalancer_recovery_group.test_no_logs_while_unsuccess_recovery = function(g)
188188
g.replica_1_a:exec(function() ivshard.storage.recovery_wakeup() end)
189189
t.assert(g.replica_1_a:grep_log('Finish bucket recovery step, 2 ' ..
190190
'sending buckets are recovered among'))
191+
t.assert(g.replica_1_a:grep_log('Recovered buckets: %[1,2%]'))
191192
end)
192193
assert_bucket_is_transferred(g.replica_2_a, g.replica_1_a,
193194
hanged_bucket_id_1)

vshard/storage/init.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,7 @@ local function recovery_step_by_type(type)
932932
local recovered = 0
933933
local total = 0
934934
local start_format = 'Starting %s buckets recovery step'
935+
local recovered_buckets = {}
935936
for _, bucket in _bucket.index.status:pairs(type) do
936937
lfiber.testcancel()
937938
total = total + 1
@@ -1002,11 +1003,13 @@ local function recovery_step_by_type(type)
10021003
bucket_id, bucket.status, remote_bucket.status, peer_id)
10031004
end
10041005
is_step_empty = false
1006+
table.insert(recovered_buckets, bucket_id)
10051007
::continue::
10061008
end
10071009
if recovered > 0 then
10081010
log.info('Finish bucket recovery step, %d %s buckets are recovered '..
10091011
'among %d', recovered, type, total)
1012+
log.info('Recovered buckets: %s', json_encode(recovered_buckets))
10101013
end
10111014
return total, recovered
10121015
end

0 commit comments

Comments
 (0)