shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

dmstats: accept --groupid for 'dmstats delete'

Browse Source 
Allow deletion of a group and all the regions it contains with a
single 'dmstats delete' command.
This commit is contained in:
Bryn M. Reeves 2016-07-01 13:15:43 +01:00
parent 837e7e513b
commit e554e375ae
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/dmsetup.c
View File

@ -4957,7 +4957,7 @@ bad:
static int _stats_delete(CMD_ARGS)
{
struct dm_stats *dms;
uint64_t region_id;
uint64_t region_id, group_id;
char *name = NULL;
const char *program_id = DM_STATS_PROGRAM_ID;
int allregions = _switches[ALL_REGIONS_ARG];
@ -4969,8 +4969,13 @@ static int _stats_delete(CMD_ARGS)
_report = NULL;
}
if (!_switches[REGION_ID_ARG] && !allregions) {
err("Please specify a --regionid or use --allregions.");
if (_switches[REGION_ID_ARG] && _switches[GROUP_ID_ARG]) {
err("Please use one of --regionid and --groupid.");
return 0;
}
if (!_switches[REGION_ID_ARG] && !allregions && !_switches[GROUP_ID_ARG]) {
err("Please specify a --regionid or --groupid, or use --allregions.");
return 0;
}
@ -4992,6 +4997,7 @@ static int _stats_delete(CMD_ARGS)
program_id = DM_STATS_ALL_PROGRAMS;
region_id = (uint64_t) _int_args[REGION_ID_ARG];
group_id = (uint64_t) _int_args[GROUP_ID_ARG];
if (!(dms = dm_stats_create(program_id)))
return_0;
@ -4999,7 +5005,9 @@ static int _stats_delete(CMD_ARGS)
if (!_bind_stats_device(dms, name))
goto_out;
if (allregions && !dm_stats_list(dms, program_id))
/* allregions and group delete require a listed handle */
if ((allregions || _switches[GROUP_ID_ARG])
&& !dm_stats_list(dms, program_id))
goto_out;
if (allregions && !dm_stats_get_nr_regions(dms)) {
@ -5008,7 +5016,12 @@ static int _stats_delete(CMD_ARGS)
goto out;
}
if (_switches[ALL_REGIONS_ARG]) {
if (_switches[GROUP_ID_ARG]) {
if (!dm_stats_delete_group(dms, group_id, 1)) {
log_error("Could not delete statistics group.");
goto out;
}
} else if (_switches[ALL_REGIONS_ARG]) {
dm_stats_walk_init(dms, DM_STATS_WALK_REGION);
dm_stats_walk_do(dms) {
region_id = dm_stats_get_current_region(dms);