]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27132 into master
authorSage Weil <sage@redhat.com>
Fri, 5 Apr 2019 13:57:31 +0000 (08:57 -0500)
committerSage Weil <sage@redhat.com>
Fri, 5 Apr 2019 13:57:31 +0000 (08:57 -0500)
* refs/pull/27132/head:
os/bluestore: new bluestore_debug_enforce_settings option.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/test/objectstore/store_test.cc

Simple merge
Simple merge
Simple merge
index f93fcabac0f7d5df7dff9ea42a1e9100f3fffb7a,fa26d083500547a86e2d47b184efbc01911cc9ca..c46d865f0bc9ee7da5c317f23d482184ae10fd0f
@@@ -2994,12 -2991,11 +2994,14 @@@ private
      auto delta = _get_bluefs_size_delta(bluefs_free, bluefs_total);
      return delta > 0 ? delta : 0;
    }
 -  int allocate_freespace(uint64_t size, PExtentVector& extents) override {
 -    return allocate_bluefs_freespace(size, &extents);
 +  int allocate_freespace(
 +    uint64_t min_size,
 +    uint64_t size,
 +    PExtentVector& extents) override {
 +    return allocate_bluefs_freespace(min_size, size, &extents);
    };
+   inline bool _use_rotational_settings();
  };
  
  inline ostream& operator<<(ostream& out, const BlueStore::volatile_statfs& s) {
Simple merge