]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: s/int/int32_t/ in pg_stat_t 2217/head
authorSage Weil <sage@redhat.com>
Sat, 9 Aug 2014 01:08:23 +0000 (18:08 -0700)
committerSage Weil <sage@redhat.com>
Sat, 9 Aug 2014 01:12:31 +0000 (18:12 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/osd_types.cc
src/osd/osd_types.h

index a7ebda474a2703d43372230985049da8085c1c78..25b69228a7310789333426eed4e26e627ff876ef 100644 (file)
@@ -1625,15 +1625,15 @@ void pg_stat_t::dump(Formatter *f) const
   f->dump_stream("stats_invalid") << stats_invalid;
   stats.dump(f);
   f->open_array_section("up");
-  for (vector<int>::const_iterator p = up.begin(); p != up.end(); ++p)
+  for (vector<int32_t>::const_iterator p = up.begin(); p != up.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("acting");
-  for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
+  for (vector<int32_t>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("blocked_by");
-  for (vector<int>::const_iterator p = blocked_by.begin();
+  for (vector<int32_t>::const_iterator p = blocked_by.begin();
        p != blocked_by.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
@@ -1645,11 +1645,11 @@ void pg_stat_t::dump_brief(Formatter *f) const
 {
   f->dump_string("state", pg_state_string(state));
   f->open_array_section("up");
-  for (vector<int>::const_iterator p = up.begin(); p != up.end(); ++p)
+  for (vector<int32_t>::const_iterator p = up.begin(); p != up.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("acting");
-  for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
+  for (vector<int32_t>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->dump_int("up_primary", up_primary);
index 30406853762d1447bacb835f57f2f6c4159f0e88..90c0bd0049fe7ac2aa7c11cdbdcef252fce1d61e 100644 (file)
@@ -1371,10 +1371,10 @@ struct pg_stat_t {
   int64_t log_size;
   int64_t ondisk_log_size;    // >= active_log_size
 
-  vector<int> up, acting;
+  vector<int32_t> up, acting;
   epoch_t mapping_epoch;
 
-  vector<int> blocked_by;  ///< osds on which the pg is blocked
+  vector<int32_t> blocked_by;  ///< osds on which the pg is blocked
 
   utime_t last_became_active;