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

Merge pull request #40807 from tchaikov/wip-common-include

Browse Source 
common/Formatter: include used header

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2021-04-14 22:39:45 +08:00 committed by GitHub
commit ba68020cea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/Formatter.cc
View File

@ -19,6 +19,7 @@
#include "include/buffer.h" #include "include/buffer.h"
#include <fmt/format.h> #include <fmt/format.h>
#include <algorithm>
#include <set> #include <set>
#include <limits> #include <limits>

1
src/include/denc.h
View File

@ -39,6 +39,7 @@
#include <boost/intrusive/set.hpp> #include <boost/intrusive/set.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include "include/compat.h"
#include "include/intarith.h" #include "include/intarith.h"
#include "include/int_types.h" #include "include/int_types.h"
#include "include/scope_guard.h" #include "include/scope_guard.h"

2
src/mon/Monitor.cc
View File

@ -3698,7 +3698,7 @@ void Monitor::handle_command(MonOpRequestRef op)
rs = ss2.str(); rs = ss2.str();
r = 0; r = 0;
} else if (prefix == "osd last-stat-seq") { } else if (prefix == "osd last-stat-seq") {
int64_t osd; int64_t osd = 0;
cmd_getval(cmdmap, "id", osd); cmd_getval(cmdmap, "id", osd);
uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd); uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd);
if (f) { if (f) {

4
src/osd/osd_types.h
View File

@ -1631,12 +1631,12 @@ public:
} }
int64_t get_dedup_tier() const { int64_t get_dedup_tier() const {
int64_t tier_id; int64_t tier_id = 0;
opts.get(pool_opts_t::DEDUP_TIER, &tier_id); opts.get(pool_opts_t::DEDUP_TIER, &tier_id);
return tier_id; return tier_id;
} }
int64_t get_dedup_cdc_chunk_size() const { int64_t get_dedup_cdc_chunk_size() const {
int64_t chunk_size; int64_t chunk_size = 0;
opts.get(pool_opts_t::DEDUP_CDC_CHUNK_SIZE, &chunk_size); opts.get(pool_opts_t::DEDUP_CDC_CHUNK_SIZE, &chunk_size);
return chunk_size; return chunk_size;
} }