Skip to content
Snippets Groups Projects
Commit 4ed88c0d authored by Danny Auble's avatar Danny Auble
Browse files

looks like we found and fixed the problem, remove debug

parent 452ae1a8
No related branches found
No related tags found
No related merge requests found
...@@ -80,8 +80,13 @@ extern List create_dynamic_block(List block_list, ...@@ -80,8 +80,13 @@ extern List create_dynamic_block(List block_list,
itr = list_iterator_create(my_block_list); itr = list_iterator_create(my_block_list);
while ((bg_record = list_next(itr))) { while ((bg_record = list_next(itr))) {
if (bg_record->magic != BLOCK_MAGIC) { if (bg_record->magic != BLOCK_MAGIC) {
error("got a block with bad magic"); /* This should never happen since we
list_remove(itr); only call this on copies of blocks
and we check on this during the
copy.
*/
error("create_dynamic_block: "
"got a block with bad magic?");
continue; continue;
} }
if (bg_record->free_cnt) { if (bg_record->free_cnt) {
...@@ -110,17 +115,7 @@ extern List create_dynamic_block(List block_list, ...@@ -110,17 +115,7 @@ extern List create_dynamic_block(List block_list,
my_bitmap = my_bitmap =
bit_alloc(bit_size(bg_record->bitmap)); bit_alloc(bit_size(bg_record->bitmap));
} }
if (!bg_record->bitmap) {
error("got %p", bg_record);
error("magic was %d %d", bg_record->magic,
BLOCK_MAGIC);
error("parent %p", bg_record->original);
error("no bitmap for bg record %s",
bg_record->bg_block_id);
error("nodes %s",
bg_record->nodes);
continue;
}
if (!bit_super_set(bg_record->bitmap, my_bitmap)) { if (!bit_super_set(bg_record->bitmap, my_bitmap)) {
bit_or(my_bitmap, bg_record->bitmap); bit_or(my_bitmap, bg_record->bitmap);
...@@ -752,12 +747,6 @@ static int _breakup_blocks(List block_list, List new_blocks, ...@@ -752,12 +747,6 @@ static int _breakup_blocks(List block_list, List new_blocks,
if (only_small && (bg_record->node_cnt > bg_conf->bp_node_cnt)) if (only_small && (bg_record->node_cnt > bg_conf->bp_node_cnt))
continue; continue;
if (!bg_record->bitmap) {
error("2 no bitmap for bg record %s %s %x",
bg_record->bg_block_id, bg_record->nodes,
bg_record->magic);
continue;
}
if (request->avail_node_bitmap && if (request->avail_node_bitmap &&
!bit_super_set(bg_record->bitmap, !bit_super_set(bg_record->bitmap,
request->avail_node_bitmap)) { request->avail_node_bitmap)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment