Compare commits
2 Commits
8603b5cb1d
...
8426616d89
Author | SHA1 | Date |
---|---|---|
Vitaliy Filippov | 8426616d89 | |
Vitaliy Filippov | 1a841344ec |
|
@ -137,6 +137,8 @@ resume_2:
|
||||||
state = 100;
|
state = 100;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (parent->progress)
|
||||||
|
printf("%s\n", result.text.c_str());
|
||||||
parent->change_parent(merge_children[current_child], new_parent, &result);
|
parent->change_parent(merge_children[current_child], new_parent, &result);
|
||||||
state = 3;
|
state = 3;
|
||||||
resume_3:
|
resume_3:
|
||||||
|
@ -168,6 +170,8 @@ resume_4:
|
||||||
state = 100;
|
state = 100;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (parent->progress)
|
||||||
|
printf("%s\n", result.text.c_str());
|
||||||
// Delete "inverse" child data
|
// Delete "inverse" child data
|
||||||
start_delete_source(inverse_child);
|
start_delete_source(inverse_child);
|
||||||
if (state == 100)
|
if (state == 100)
|
||||||
|
@ -184,6 +188,8 @@ resume_5:
|
||||||
state = 100;
|
state = 100;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (parent->progress)
|
||||||
|
printf("%s\n", result.text.c_str());
|
||||||
// Delete "inverse" child metadata, rename parent over it,
|
// Delete "inverse" child metadata, rename parent over it,
|
||||||
// and also change parent links of the previous "inverse" child
|
// and also change parent links of the previous "inverse" child
|
||||||
rename_inverse_parent();
|
rename_inverse_parent();
|
||||||
|
@ -212,6 +218,8 @@ resume_7:
|
||||||
state = 100;
|
state = 100;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (parent->progress)
|
||||||
|
printf("%s\n", result.text.c_str());
|
||||||
delete_inode_config(chain_list[current_child]);
|
delete_inode_config(chain_list[current_child]);
|
||||||
if (state == 100)
|
if (state == 100)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -183,6 +183,18 @@ struct rm_inode_t
|
||||||
}
|
}
|
||||||
if (lists_done && !lists.size())
|
if (lists_done && !lists.size())
|
||||||
{
|
{
|
||||||
|
if (parent->progress && total_count > 0)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "\n");
|
||||||
|
}
|
||||||
|
if (parent->progress && (total_done < total_count || inactive_osds.size() > 0))
|
||||||
|
{
|
||||||
|
fprintf(
|
||||||
|
stderr, "Warning: Pool:%u,ID:%lu inode data may not have been fully removed.\n"
|
||||||
|
" Use `vitastor-cli rm-data --pool %u --inode %lu` if you encounter it in listings.\n",
|
||||||
|
pool_id, INODE_NO_POOL(inode), pool_id, INODE_NO_POOL(inode)
|
||||||
|
);
|
||||||
|
}
|
||||||
result = (cli_result_t){
|
result = (cli_result_t){
|
||||||
.err = error_count > 0 ? EIO : 0,
|
.err = error_count > 0 ? EIO : 0,
|
||||||
.text = error_count > 0 ? "Some blocks were not removed" : (
|
.text = error_count > 0 ? "Some blocks were not removed" : (
|
||||||
|
@ -195,10 +207,6 @@ struct rm_inode_t
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
state = 100;
|
state = 100;
|
||||||
if (parent->progress && total_count > 0)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue