RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

crush: wrap crush_bucket_{remove,add}_item

Browse Source 
Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2017-05-26 11:52:45 +03:00
parent 6b6c14f8c7
commit ffc0d0f1bf
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/crush/CrushWrapper.cc
View File

@ -350,7 +350,7 @@ int CrushWrapper::remove_item(CephContext *cct, int item, bool unlink_only)
if (id == item) {
ldout(cct, 5) << "remove_item removing item " << item
<< " from bucket " << b->id << dendl;
crush_bucket_remove_item(crush, b, item);
bucket_remove_item(b, item);
adjust_item_weight(cct, b->id, b->weight);
ret = 0;
}
@ -422,7 +422,7 @@ int CrushWrapper::_remove_item_under(CephContext *cct, int item, int ancestor, b
int id = b->items[i];
if (id == item) {
ldout(cct, 5) << "_remove_item_under removing item " << item << " from bucket " << b->id << dendl;
crush_bucket_remove_item(crush, b, item);
bucket_remove_item(b, item);
adjust_item_weight(cct, b->id, b->weight);
ret = 0;
} else if (id < 0) {
@ -774,7 +774,7 @@ int CrushWrapper::insert_item(CephContext *cct, int item, float weight, string n
ldout(cct, 5) << "insert_item adding " << cur << " weight " << weight
<< " to bucket " << id << dendl;
int r = crush_bucket_add_item(crush, b, cur, 0);
int r = bucket_add_item(b, cur, 0);
assert (!r);
break;
}
@ -839,20 +839,20 @@ int CrushWrapper::swap_bucket(CephContext *cct, int src, int dst)
int item = a->items[0];
int itemw = crush_get_bucket_item_weight(a, 0);
tmp[item] = itemw;
crush_bucket_remove_item(crush, a, item);
bucket_remove_item(a, item);
}
assert(a->size == 0);
assert(b->size == bs);
for (unsigned i = 0; i < bs; ++i) {
int item = b->items[0];
int itemw = crush_get_bucket_item_weight(b, 0);
crush_bucket_remove_item(crush, b, item);
crush_bucket_add_item(crush, a, item, itemw);
bucket_remove_item(b, item);
bucket_add_item(a, item, itemw);
}
assert(a->size == bs);
assert(b->size == 0);
for (auto t : tmp) {
crush_bucket_add_item(crush, b, t.first, t.second);
bucket_add_item(b, t.first, t.second);
}
assert(a->size == bs);
assert(b->size == as);
@ -1375,6 +1375,16 @@ int CrushWrapper::remove_rule(int ruleno)
return 0;
}
int CrushWrapper::bucket_add_item(crush_bucket *bucket, int item, int weight)
{
return crush_bucket_add_item(crush, bucket, item, weight);
}
int CrushWrapper::bucket_remove_item(crush_bucket *bucket, int item)
{
return crush_bucket_remove_item(crush, bucket, item);
}
int CrushWrapper::update_device_class(CephContext *cct, int id, const string& class_name, const string& name)
{
int class_id = get_class_id(class_name);
@ -1429,7 +1439,7 @@ int CrushWrapper::device_class_clone(int original_id, int device_class, int *clo
int weight = crush_get_bucket_item_weight(original, i);
if (item >= 0) {
if (class_map.count(item) != 0 && class_map[item] == device_class) {
int res = crush_bucket_add_item(crush, copy, item, weight);
int res = bucket_add_item(copy, item, weight);
if (res)
return res;
}
@ -1441,7 +1451,7 @@ int CrushWrapper::device_class_clone(int original_id, int device_class, int *clo
crush_bucket *child_copy = get_bucket(child_copy_id);
if (IS_ERR(child_copy))
return -ENOENT;
res = crush_bucket_add_item(crush, copy, child_copy_id, child_copy->weight);
res = bucket_add_item(copy, child_copy_id, child_copy->weight);
if (res)
return res;
}

7
src/crush/CrushWrapper.h
View File

@ -1048,7 +1048,7 @@ private:
adjust_item_weight(cct, parent_bucket->id, parent_bucket->weight);
// remove the bucket from the parent
crush_bucket_remove_item(crush, parent_bucket, item);
bucket_remove_item(parent_bucket, item);
} else if (PTR_ERR(parent_bucket) != -ENOENT) {
return PTR_ERR(parent_bucket);
}
@ -1140,7 +1140,10 @@ public:
assert(b);
return crush_add_bucket(crush, bucketno, b, idout);
}
int bucket_add_item(crush_bucket *bucket, int item, int weight);
int bucket_remove_item(struct crush_bucket *bucket, int item);
void finalize() {
assert(crush);
crush_finalize(crush);