Merge pull request #7062 from wonzhq/scrub-prio-pool

osd: add the support of per pool scrub priority

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc qa/workunits/cephtool/test.sh
Simple merge

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

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

diff --cc src/osd/PG.cc
index 4fb606114dffa1d32650b07c6b7782a81beabe1c,799d8d4c15ee4658d5e51496ba0e300410a27f5c..38623735f1a9b1abb4f8c4701f9e3ab5c17e3b69
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -2089,9 -2047,17 +2089,17 @@@ bool PG::queue_scrub(
    return true;
  }
  
+ unsigned PG::get_scrub_priority()
+ {
+   // a higher value -> a higher priority
+   int pool_scrub_priority = 0;
+   pool.info.opts.get(pool_opts_t::SCRUB_PRIORITY, &pool_scrub_priority);
+   return pool_scrub_priority > 0 ? pool_scrub_priority : cct->_conf->osd_scrub_priority;
+ }
+ 
  struct C_PG_FinishRecovery : public Context {
    PGRef pg;
 -  C_PG_FinishRecovery(PG *p) : pg(p) {}
 +  explicit C_PG_FinishRecovery(PG *p) : pg(p) {}
    void finish(int r) {
      pg->_finish_recovery(this);
    }

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

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

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