Skip to content

Commit dd45892

Browse files
committed
rgw/notifications/lc: handle publish_commit() failures as warnings
Fixes: https://tracker.ceph.com/issues/63859 Signed-off-by: Yuval Lifshitz <[email protected]>
1 parent c52c2dc commit dd45892

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/rgw/rgw_lc.cc

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -574,13 +574,12 @@ static int remove_expired_obj(
574574
fmt::format("ERROR: {} failed, with error: {}", __func__, ret) << dendl;
575575
} else {
576576
// send request to notification manager
577-
ret = notify->publish_commit(dpp, obj_state->size,
577+
int publish_ret = notify->publish_commit(dpp, obj_state->size,
578578
ceph::real_clock::now(),
579579
obj_state->attrset[RGW_ATTR_ETAG].to_str(),
580580
version_id);
581-
if (ret < 0) {
582-
ldpp_dout(dpp, 1) << "ERROR: notify publish_commit failed, with error: "
583-
<< ret << dendl;
581+
if (publish_ret < 0) {
582+
ldpp_dout(dpp, 5) << "WARNING: notify publish_commit failed, with error: " << publish_ret << dendl;
584583
}
585584
}
586585

@@ -860,13 +859,13 @@ int RGWLC::handle_multipart_expiration(rgw::sal::Bucket* target,
860859

861860
ret = mpu->abort(this, cct, null_yield);
862861
if (ret == 0) {
863-
ret = notify->publish_commit(
862+
int publish_ret = notify->publish_commit(
864863
this, sal_obj->get_obj_size(), ceph::real_clock::now(),
865864
sal_obj->get_attrs()[RGW_ATTR_ETAG].to_str(),
866865
version_id);
867-
if (ret < 0) {
868-
ldpp_dout(wk->get_lc(), 1)
869-
<< "ERROR: notify publish_commit failed, with error: " << ret
866+
if (publish_ret < 0) {
867+
ldpp_dout(wk->get_lc(), 5)
868+
<< "WARNING: notify publish_commit failed, with error: " << publish_ret
870869
<< dendl;
871870
}
872871
if (perfcounter) {
@@ -1366,13 +1365,13 @@ class LCOpAction_Transition : public LCOpAction {
13661365
return ret;
13671366
} else {
13681367
// send request to notification manager
1369-
ret = notify->publish_commit(oc.dpp, obj->get_obj_size(),
1368+
int publish_ret = notify->publish_commit(oc.dpp, obj->get_obj_size(),
13701369
ceph::real_clock::now(),
13711370
obj->get_attrs()[RGW_ATTR_ETAG].to_str(),
13721371
version_id);
1373-
if (ret < 0) {
1374-
ldpp_dout(oc.dpp, 1) <<
1375-
"ERROR: notify publish_commit failed, with error: " << ret << dendl;
1372+
if (publish_ret < 0) {
1373+
ldpp_dout(oc.dpp, 5) <<
1374+
"WARNING: notify publish_commit failed, with error: " << publish_ret << dendl;
13761375
}
13771376
}
13781377

0 commit comments

Comments
 (0)