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>

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/messages/MBackfillReserve.h
index 745077abc17fcfea68c218830f323e290f656a94,913db96bbd80760eb5273037f43ac16bd5d78477..ab571c49f6dd0cfd4af84187c998440bda4fa6f5
--- 1/src/messages/MBackfillReserve.h
--- 2/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";
    }
  

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.h
Simple merge

diff --cc src/osd/ReplicatedBackend.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge