From: Kefu Chai Date: Mon, 16 Aug 2021 08:01:42 +0000 (+0800) Subject: rgw/rgw_dencoder: set identity_type when creating samples X-Git-Tag: v16.2.11~358^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=230be0fc97128c8ecbcbcec51e8a80ec5e5ec7b5;p=ceph.git rgw/rgw_dencoder: set identity_type when creating samples otherwise identity_type is a random number on stack. and there is good chance that it does not match with the one decoded from the encoded blob. this change should address the failures like: **** rgw_log_entry test 2 binary reencode check failed **** ceph-dencoder type rgw_log_entry select_test 2 encode export /tmp/typ-O8hVYK2Gb ceph-dencoder type rgw_log_entry select_test 2 encode decode encode export /tmp/typ-G09itHHIC cmp /tmp/typ-O8hVYK2Gb /tmp/typ-G09itHHIC The following tests FAILED: 132 - check-generated.sh (Failed) .. Fixes: https://tracker.ceph.com/issues/52278 Signed-off-by: Kefu Chai (cherry picked from commit 22095f4bd831f0d736ba364ea9e46febe06576f9) --- diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc index 3835b7776a88..10fc0eb303a2 100644 --- a/src/rgw/rgw_dencoder.cc +++ b/src/rgw/rgw_dencoder.cc @@ -80,6 +80,7 @@ void rgw_log_entry::generate_test_instances(list& o) e->referrer = "referrer"; e->bucket_id = "10"; e->trans_id = "trans_id"; + e->identity_type = TYPE_RGW; o.push_back(e); o.push_back(new rgw_log_entry); }