From: David Zafman <dzafman@redhat.com>
Date: Fri, 18 Jan 2019 15:42:00 +0000 (-0800)
Subject: Merge pull request #22797 from dzafman/wip-19753
X-Git-Tag: v14.1.0~344
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99ddd3666b21861ede6bb4d8ef2d65f2009fdf67;p=ceph-ci.git

Merge pull request #22797 from dzafman/wip-19753

osd: Deny reservation if expected backfill size would put us over bac…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

99ddd3666b21861ede6bb4d8ef2d65f2009fdf67
diff --cc src/messages/MBackfillReserve.h
index 745077abc17,913db96bbd8..ab571c49f6d
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@@ -93,15 -95,19 +95,19 @@@ public
  
    MBackfillReserve()
      : MessageInstance(MSG_OSD_BACKFILL_RESERVE, HEAD_VERSION, COMPAT_VERSION),
-       query_epoch(0), type(-1), priority(-1) {}
+       query_epoch(0), type(-1), priority(-1), primary_num_bytes(0),
+       shard_num_bytes(0) {}
    MBackfillReserve(int type,
  		   spg_t pgid,
- 		   epoch_t query_epoch, unsigned prio = -1)
+ 		   epoch_t query_epoch, unsigned prio = -1,
+ 		   int64_t primary_num_bytes = 0,
+                    int64_t shard_num_bytes = 0)
      : MessageInstance(MSG_OSD_BACKFILL_RESERVE, HEAD_VERSION, COMPAT_VERSION),
        pgid(pgid), query_epoch(query_epoch),
-       type(type), priority(prio) {}
+       type(type), priority(prio), primary_num_bytes(primary_num_bytes),
+       shard_num_bytes(shard_num_bytes) {}
  
 -  const char *get_type_name() const override {
 +  std::string_view get_type_name() const override {
      return "MBackfillReserve";
    }