From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 2 Apr 2019 11:31:36 +0000 (+0800)
Subject: Merge pull request #27255 from adamemerson/wip-names-common-through-objecter
X-Git-Tag: v15.0.0~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53c66a1f8d54911bdc7f8d1f2696e49aabca8fe7;p=ceph.git

Merge pull request #27255 from adamemerson/wip-names-common-through-objecter

Remove dependence on `using namespace`: Build of 'common' through osdc/Objecter.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

53c66a1f8d54911bdc7f8d1f2696e49aabca8fe7
diff --cc src/osd/osd_types.cc
index 5c4407b596cf,d40e7e97dfed..cc3ec866e433
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@@ -393,9 -426,9 +427,9 @@@ void osd_stat_t::dump(Formatter *f) con
    f->close_section();
  }
  
- void osd_stat_t::encode(bufferlist &bl, uint64_t features) const
+ void osd_stat_t::encode(ceph::buffer::list &bl, uint64_t features) const
  {
 -  ENCODE_START(10, 2, bl);
 +  ENCODE_START(11, 2, bl);
  
    //////// for compatibility ////////
    int64_t kb = statfs.kb();
@@@ -2239,12 -2253,11 +2267,12 @@@ void object_stat_sum_t::dump(Formatter 
    f->dump_int("num_objects_manifest", num_objects_manifest);
    f->dump_int("num_omap_bytes", num_omap_bytes);
    f->dump_int("num_omap_keys", num_omap_keys);
 +  f->dump_int("num_objects_repaired", num_objects_repaired);
  }
  
- void object_stat_sum_t::encode(bufferlist& bl) const
+ void object_stat_sum_t::encode(ceph::buffer::list& bl) const
  {
 -  ENCODE_START(19, 14, bl);
 +  ENCODE_START(20, 14, bl);
  #if defined(CEPH_LITTLE_ENDIAN)
    bl.append((char *)(&num_bytes), sizeof(object_stat_sum_t));
  #else
@@@ -2292,10 -2304,10 +2320,10 @@@
    ENCODE_FINISH(bl);
  }
  
- void object_stat_sum_t::decode(bufferlist::const_iterator& bl)
+ void object_stat_sum_t::decode(ceph::buffer::list::const_iterator& bl)
  {
    bool decode_finish = false;
 -  DECODE_START(19, bl);  // make sure to also update fast decode below
 +  DECODE_START(20, bl);  // make sure to also update fast decode below
  #if defined(CEPH_LITTLE_ENDIAN)
    if (struct_v >= 19) {  // this must match newest decode version
      bl.copy(sizeof(object_stat_sum_t), (char*)(&num_bytes));
diff --cc src/osd/osd_types.h
index 56edc6522cd7,70f46b454bed..1d59a85fd9dc
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@@ -960,10 -961,9 +961,10 @@@ WRITE_CLASS_ENCODER_FEATURES(objectstor
  #define PG_STATE_SNAPTRIM_ERROR     (1ULL << 29) // error stopped trimming snaps
  #define PG_STATE_FORCED_RECOVERY    (1ULL << 30) // force recovery of this pg before any other
  #define PG_STATE_FORCED_BACKFILL    (1ULL << 31) // force backfill of this pg before any other
 +#define PG_STATE_FAILED_REPAIR      (1ULL << 32) // A repair failed to fix all errors
  
  std::string pg_state_string(uint64_t state);
- std::string pg_vector_string(const vector<int32_t> &a);
+ std::string pg_vector_string(const std::vector<int32_t> &a);
  boost::optional<uint64_t> pg_string_state(const std::string& state);
  
  
@@@ -2320,9 -2315,8 +2321,9 @@@ std::ostream &operator<<(std::ostream &
   */
  struct osd_stat_t {
    store_statfs_t statfs;
-   vector<int> hb_peers;
+   std::vector<int> hb_peers;
    int32_t snap_trim_queue_len, num_snap_trimming;
 +  uint64_t num_shards_repaired;
  
    pow2_hist_t op_queue_age_hist;