RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 16:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37613 from tchaikov/wip-cls-osd-cleanup

Browse Source 
cls, osd: cleanups

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Kefu Chai 2020-10-13 14:23:29 +08:00 committed by GitHub
commit 8ae611e584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph_osd.cc
View File

@ -20,11 +20,11 @@
#include <iostream>
#include <string>
#include "auth/KeyRing.h"
#include "osd/OSD.h"
#include "os/ObjectStore.h"
#include "mon/MonClient.h"
#include "include/ceph_features.h"
#include "common/config.h"
#include "mon/MonMap.h"

4
src/cls/fifo/cls_fifo.cc
View File

@ -700,8 +700,8 @@ int EntryReader::get_next_entry(ceph::buffer::list* pbl,
*pofs = ofs;
}
CLS_LOG(10, "%s():%d: pre_header.pre_size=%llu", __func__, __LINE__,
pre_header.pre_size);
CLS_LOG(10, "%s():%d: pre_header.pre_size=%" PRIu64, __func__, __LINE__,
uint64_t(pre_header.pre_size));
r = seek(pre_header.pre_size);
if (r < 0) {
CLS_ERR("ERROR: %s(): failed to seek: r=%d", __func__, r);

1
src/osd/OSD.cc
View File

@ -145,6 +145,7 @@
#include "perfglue/cpu_profiler.h"
#include "perfglue/heap_profiler.h"
#include "osd/ClassHandler.h"
#include "osd/OpRequest.h"
#include "auth/AuthAuthorizeHandler.h"

8
src/osd/OSD.h
View File

@ -31,11 +31,6 @@
#include "mgr/MgrClient.h"
#include "os/ObjectStore.h"
#include "OSDCap.h"
#include "auth/KeyRing.h"
#include "osd/ClassHandler.h"
#include "include/CompatSet.h"
#include "include/common_fwd.h"
@ -54,9 +49,6 @@
#include "common/shared_cache.hpp"
#include "common/simple_cache.hpp"
#include "common/sharedptr_registry.hpp"
#include "common/WeightedPriorityQueue.h"
#include "common/PrioritizedQueue.h"
#include "messages/MOSDOp.h"
#include "common/EventTrace.h"
#include "osd/osd_perf_counters.h"

1
src/osd/PrimaryLogPG.cc
View File

@ -24,6 +24,7 @@
#include "ScrubStore.h"
#include "Session.h"
#include "objclass/objclass.h"
#include "osd/ClassHandler.h"
#include "cls/cas/cls_cas_ops.h"
#include "common/ceph_crypto.h"