From: Sage Weil <sage@redhat.com>
Date: Fri, 5 Apr 2019 13:57:31 +0000 (-0500)
Subject: Merge PR #27132 into master
X-Git-Tag: v15.1.0~3020
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cbcfe6e45fdccccf223284be9b8c36cd1471d52e;p=ceph.git

Merge PR #27132 into master

* refs/pull/27132/head:
	os/bluestore: new bluestore_debug_enforce_settings option.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

cbcfe6e45fdccccf223284be9b8c36cd1471d52e
diff --cc src/os/bluestore/BlueStore.h
index f93fcabac0f7,fa26d0835005..c46d865f0bc9
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@@ -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) {