mirror of
https://github.com/ceph/ceph
synced 2024-12-17 17:05:42 +00:00
*** empty log message ***
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@598 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
parent
f741218756
commit
343565f68c
@ -156,6 +156,7 @@ md_config_t g_conf = {
|
||||
bdev_el_bw_max_ms: 300, // restart elevator at least once every 300 ms
|
||||
bdev_el_bidir: true, // bidirectional elevator?
|
||||
bdev_iov_max: 512, // max # iov's to collect into a single readv()/writev() call
|
||||
bdev_debug_check_io_overlap: true, // [DEBUG] check for any pending io overlaps
|
||||
|
||||
// --- fakeclient (mds regression testing) (ancient history) ---
|
||||
num_fakeclient: 100,
|
||||
|
@ -129,6 +129,7 @@ struct md_config_t {
|
||||
int bdev_el_bw_max_ms;
|
||||
bool bdev_el_bidir;
|
||||
int bdev_iov_max;
|
||||
bool bdev_debug_check_io_overlap;
|
||||
|
||||
// fake client
|
||||
int num_fakeclient;
|
||||
|
@ -382,7 +382,7 @@ void BlockDevice::_submit_io(biovec *b)
|
||||
io_wakeup.SignalAll();
|
||||
|
||||
// [DEBUG] check for overlapping ios
|
||||
if (0) {
|
||||
if (g_conf.bdev_debug_check_io_overlap) {
|
||||
// BUG: this doesn't catch everything! eg 1~10000000 will be missed....
|
||||
multimap<block_t, biovec*>::iterator p = io_queue.lower_bound(b->start);
|
||||
if ((p != io_queue.end() &&
|
||||
|
@ -2,6 +2,7 @@
|
||||
#include "FakeStore.h"
|
||||
#include "include/types.h"
|
||||
|
||||
#include "common/Timer.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -88,7 +88,7 @@ class OSDMap {
|
||||
// oid -> ps
|
||||
ps_t object_to_ps(object_t oid) {
|
||||
static crush::Hash H(777);
|
||||
return H( (oid & 0xffffffffUL) ^ (oid >> 32) ) & PG_PS_MASK;
|
||||
return H( oid ^ (oid >> 32) ) & PG_PS_MASK;
|
||||
}
|
||||
|
||||
// (ps, nrep) -> pg
|
||||
@ -112,8 +112,9 @@ class OSDMap {
|
||||
int pg_to_osds(pg_t pg,
|
||||
vector<int>& osds) { // list of osd addr's
|
||||
int num_rep = pg_to_nrep(pg);
|
||||
pg_t ps = pg_to_ps(pg);
|
||||
crush.do_rule(crush.rules[num_rep],
|
||||
(pg & 0xffffffff) ^ (pg >> 32),
|
||||
ps ^ (ps >> 32),
|
||||
osds);
|
||||
return osds.size();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user