Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/common/Makefile.am
Simple merge

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

diff --cc src/osd/OSD.cc
index e1182339c5b05837af2a36ecbca6d9ddb0b4ab1c,db8386f5baa609e59f5e68a59a5797432414e98e..94433db45f5496186ac5e9f1ca02b871b54e5d81
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -1577,9 -1580,11 +1577,11 @@@ OSD::OSD(CephContext *cct_, ObjectStor
    heartbeat_thread(this),
    heartbeat_dispatcher(this),
    finished_lock("OSD::finished_lock"),
 -  op_tracker(cct, cct->_conf->osd_enable_op_tracker, 
 +  op_tracker(cct, cct->_conf->osd_enable_op_tracker,
                    cct->_conf->osd_num_op_tracker_shard),
    test_ops_hook(NULL),
+   op_queue(get_io_queue()),
+   op_prio_cutoff(get_io_prio_cut()),
    op_shardedwq(
      cct->_conf->osd_op_num_shards,
      this,
@@@ -8361,10 -8293,10 +8365,10 @@@ void OSD::ShardedOpWQ::_process(uint32_
        return;
      }
    }
-   pair<PGRef, PGQueueable> item = sdata->pqueue.dequeue();
+   pair<PGRef, PGQueueable> item = sdata->pqueue->dequeue();
    sdata->pg_for_processing[&*(item.first)].push_back(item.second);
    sdata->sdata_op_ordering_lock.Unlock();
 -  ThreadPool::TPHandle tp_handle(osd->cct, hb, timeout_interval, 
 +  ThreadPool::TPHandle tp_handle(osd->cct, hb, timeout_interval,
      suicide_interval);
  
    (item.first)->lock_suspend_timeout(tp_handle);

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

diff --cc src/test/CMakeLists.txt
Simple merge

diff --cc src/test/Makefile.am
Simple merge

diff --cc src/test/common/test_prioritized_queue.cc
Simple merge