From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Feb 2016 13:53:22 +0000 (-0500)
Subject: Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph
X-Git-Tag: v10.0.4~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e478a4f2a78d949f539fdf5b89134b4284550499;p=ceph.git

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

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

e478a4f2a78d949f539fdf5b89134b4284550499
diff --cc src/osd/OSD.cc
index e1182339c5b0,db8386f5baa6..94433db45f54
--- a/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);