@@ -1354,10 +1354,11 @@ TEST_F(cls_rgw, index_racing_removes)
13541354}
13551355
13561356void set_reshard_status (librados::IoCtx& ioctx, const std::string& oid,
1357- const cls_rgw_bucket_instance_entry& entry )
1357+ cls_rgw_reshard_status status )
13581358{
13591359 map<int , string> bucket_objs;
13601360 bucket_objs[0 ] = oid;
1361+ const auto entry = cls_rgw_bucket_instance_entry{.reshard_status = status};
13611362 int r = CLSRGWIssueSetBucketResharding (ioctx, bucket_objs, entry, 1 )();
13621363 ASSERT_EQ (0 , r);
13631364}
@@ -1395,9 +1396,7 @@ TEST_F(cls_rgw, reshardlog_list)
13951396 ASSERT_EQ (0u , entries.size ());
13961397
13971398 // set reshard status to IN_LOGRECORD
1398- cls_rgw_bucket_instance_entry entry;
1399- entry.reshard_status = cls_rgw_reshard_status::IN_LOGRECORD;
1400- set_reshard_status (ioctx, bucket_oid, entry);
1399+ set_reshard_status (ioctx, bucket_oid, cls_rgw_reshard_status::IN_LOGRECORD);
14011400
14021401 // record a log in prepare
14031402 cls_rgw_obj_key obj2 = str_int (" obj2" , 0 );
@@ -1465,9 +1464,7 @@ TEST_F(cls_rgw, reshardlog_num)
14651464 reshardlog_entries (ioctx, bucket_oid, 0u );
14661465
14671466 // set reshard status to IN_LOGRECORD
1468- cls_rgw_bucket_instance_entry entry;
1469- entry.reshard_status = cls_rgw_reshard_status::IN_LOGRECORD;
1470- set_reshard_status (ioctx, bucket_oid, entry);
1467+ set_reshard_status (ioctx, bucket_oid, cls_rgw_reshard_status::IN_LOGRECORD);
14711468
14721469 // record a log in prepare not add reshardlog_entry
14731470 cls_rgw_obj_key obj2 = str_int (" obj2" , 0 );
0 commit comments