Skip to content

Commit c5684e4

Browse files
authored
Merge pull request ceph#46226 from ronen-fr/wip-rf-cln-typesh
osd: cleanup object_stat_sum_t initialization Reviewed-by: Matan Breizman <[email protected]>
2 parents 42b74f4 + a1c5052 commit c5684e4

File tree

1 file changed

+42
-70
lines changed

1 file changed

+42
-70
lines changed

src/osd/osd_types.h

Lines changed: 42 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,76 +1889,48 @@ struct object_stat_sum_t {
18891889
* WARNING: be sure to update operator==, floor, and split when
18901890
* adding/removing fields!
18911891
**************************************************************************/
1892-
int64_t num_bytes; // in bytes
1893-
int64_t num_objects;
1894-
int64_t num_object_clones;
1895-
int64_t num_object_copies; // num_objects * num_replicas
1896-
int64_t num_objects_missing_on_primary;
1897-
int64_t num_objects_degraded;
1898-
int64_t num_objects_unfound;
1899-
int64_t num_rd;
1900-
int64_t num_rd_kb;
1901-
int64_t num_wr;
1902-
int64_t num_wr_kb;
1903-
int64_t num_scrub_errors; // total deep and shallow scrub errors
1904-
int64_t num_objects_recovered;
1905-
int64_t num_bytes_recovered;
1906-
int64_t num_keys_recovered;
1907-
int64_t num_shallow_scrub_errors;
1908-
int64_t num_deep_scrub_errors;
1909-
int64_t num_objects_dirty;
1910-
int64_t num_whiteouts;
1911-
int64_t num_objects_omap;
1912-
int64_t num_objects_hit_set_archive;
1913-
int64_t num_objects_misplaced;
1914-
int64_t num_bytes_hit_set_archive;
1915-
int64_t num_flush;
1916-
int64_t num_flush_kb;
1917-
int64_t num_evict;
1918-
int64_t num_evict_kb;
1919-
int64_t num_promote;
1920-
int32_t num_flush_mode_high; // 1 when in high flush mode, otherwise 0
1921-
int32_t num_flush_mode_low; // 1 when in low flush mode, otherwise 0
1922-
int32_t num_evict_mode_some; // 1 when in evict some mode, otherwise 0
1923-
int32_t num_evict_mode_full; // 1 when in evict full mode, otherwise 0
1924-
int64_t num_objects_pinned;
1925-
int64_t num_objects_missing;
1926-
int64_t num_legacy_snapsets; ///< upper bound on pre-luminous-style SnapSets
1927-
int64_t num_large_omap_objects = 0;
1928-
int64_t num_objects_manifest = 0;
1929-
int64_t num_omap_bytes = 0;
1930-
int64_t num_omap_keys = 0;
1931-
int64_t num_objects_repaired = 0;
1932-
1933-
object_stat_sum_t()
1934-
: num_bytes(0),
1935-
num_objects(0), num_object_clones(0), num_object_copies(0),
1936-
num_objects_missing_on_primary(0), num_objects_degraded(0),
1937-
num_objects_unfound(0),
1938-
num_rd(0), num_rd_kb(0), num_wr(0), num_wr_kb(0),
1939-
num_scrub_errors(0),
1940-
num_objects_recovered(0),
1941-
num_bytes_recovered(0),
1942-
num_keys_recovered(0),
1943-
num_shallow_scrub_errors(0),
1944-
num_deep_scrub_errors(0),
1945-
num_objects_dirty(0),
1946-
num_whiteouts(0),
1947-
num_objects_omap(0),
1948-
num_objects_hit_set_archive(0),
1949-
num_objects_misplaced(0),
1950-
num_bytes_hit_set_archive(0),
1951-
num_flush(0),
1952-
num_flush_kb(0),
1953-
num_evict(0),
1954-
num_evict_kb(0),
1955-
num_promote(0),
1956-
num_flush_mode_high(0), num_flush_mode_low(0),
1957-
num_evict_mode_some(0), num_evict_mode_full(0),
1958-
num_objects_pinned(0),
1959-
num_objects_missing(0),
1960-
num_legacy_snapsets(0)
1961-
{}
1892+
int64_t num_bytes{0}; // in bytes
1893+
int64_t num_objects{0};
1894+
int64_t num_object_clones{0};
1895+
int64_t num_object_copies{0}; // num_objects * num_replicas
1896+
int64_t num_objects_missing_on_primary{0};
1897+
int64_t num_objects_degraded{0};
1898+
int64_t num_objects_unfound{0};
1899+
int64_t num_rd{0};
1900+
int64_t num_rd_kb{0};
1901+
int64_t num_wr{0};
1902+
int64_t num_wr_kb{0};
1903+
int64_t num_scrub_errors{0}; // total deep and shallow scrub errors
1904+
int64_t num_objects_recovered{0};
1905+
int64_t num_bytes_recovered{0};
1906+
int64_t num_keys_recovered{0};
1907+
int64_t num_shallow_scrub_errors{0};
1908+
int64_t num_deep_scrub_errors{0};
1909+
int64_t num_objects_dirty{0};
1910+
int64_t num_whiteouts{0};
1911+
int64_t num_objects_omap{0};
1912+
int64_t num_objects_hit_set_archive{0};
1913+
int64_t num_objects_misplaced{0};
1914+
int64_t num_bytes_hit_set_archive{0};
1915+
int64_t num_flush{0};
1916+
int64_t num_flush_kb{0};
1917+
int64_t num_evict{0};
1918+
int64_t num_evict_kb{0};
1919+
int64_t num_promote{0};
1920+
int32_t num_flush_mode_high{0}; // 1 when in high flush mode, otherwise 0
1921+
int32_t num_flush_mode_low{0}; // 1 when in low flush mode, otherwise 0
1922+
int32_t num_evict_mode_some{0}; // 1 when in evict some mode, otherwise 0
1923+
int32_t num_evict_mode_full{0}; // 1 when in evict full mode, otherwise 0
1924+
int64_t num_objects_pinned{0};
1925+
int64_t num_objects_missing{0};
1926+
int64_t num_legacy_snapsets{0}; ///< upper bound on pre-luminous-style SnapSets
1927+
int64_t num_large_omap_objects{0};
1928+
int64_t num_objects_manifest{0};
1929+
int64_t num_omap_bytes{0};
1930+
int64_t num_omap_keys{0};
1931+
int64_t num_objects_repaired{0};
1932+
1933+
object_stat_sum_t() = default;
19621934

19631935
void floor(int64_t f) {
19641936
#define FLOOR(x) if (x < f) x = f

0 commit comments

Comments
 (0)