RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38977 from adamemerson/wip-48929

Browse Source 
rgw: Fix spurious error on empty datalog shard
This commit is contained in:
Harish Munjulur 2021-01-25 11:48:56 -08:00 committed by GitHub
commit 29c9eb32e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rgw/cls_fifo_legacy.cc
View File

@ -39,7 +39,7 @@
#include "cls_fifo_legacy.h"
namespace rgw::cls::fifo {
static constexpr auto dout_subsys = ceph_subsys_rgw;
static constexpr auto dout_subsys = ceph_subsys_objclass;
namespace cb = ceph::buffer;
namespace fifo = rados::cls::fifo;

4
src/rgw/rgw_datalog.cc
View File

@ -192,6 +192,10 @@ public:
max_entries, log_entries,
std::string(marker.value_or("")),
out_marker, truncated, null_yield);
if (r == -ENOENT) {
*truncated = false;
return 0;
}
if (r < 0) {
lderr(cct) << __PRETTY_FUNCTION__
<< ": failed to list " << oids[index]