Skip to content

Commit 8a27bf1

Browse files
authored
Merge pull request ceph#66238 from yuvalif/wip-yuval-73845
rgw/logging: do not create empty temporary objects
2 parents 2d6e2ca + 256eb4c commit 8a27bf1

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

src/rgw/driver/rados/rgw_sal_rados.cc

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,23 +1313,8 @@ int RadosBucket::commit_logging_object(const std::string& obj_name,
13131313
<< ". error: " << ret << dendl;
13141314
return ret;
13151315
}
1316+
mtime = ceph::real_time::clock::now();
13161317
ldpp_dout(dpp, 20) << "INFO: temporary logging object '" << temp_obj_name << "' does not exist. committing it empty" << dendl;
1317-
// creating an empty object
1318-
if (ret = rgw_put_system_obj(dpp, store->svc()->sysobj,
1319-
data_pool,
1320-
temp_obj_name,
1321-
bl_data, // empty bufferlist
1322-
true, // exclusive
1323-
nullptr,
1324-
ceph::real_time::clock::now(),
1325-
y); ret < 0) {
1326-
if (ret == -EEXIST) {
1327-
ldpp_dout(dpp, 5) << "WARNING: race detected in committing an empty logging object '" << temp_obj_name << dendl;
1328-
} else {
1329-
ldpp_dout(dpp, 1) << "ERROR: failed to commit empty logging object '" << temp_obj_name << "'. error: " << ret << dendl;
1330-
}
1331-
return ret;
1332-
}
13331318
}
13341319

13351320
uint64_t size = bl_data.length();

0 commit comments

Comments
 (0)