shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dmeventd: unify error handling

Browse Source 
Always make sure the 'status' is release on 'error' path (thin pluging missed)
Make code looking same across all plugins.
This commit is contained in:
Zdenek Kabelac 2017-02-13 19:00:59 +01:00
parent 5a87d8667d
commit 05dd566a52
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
View File

@ -184,16 +184,12 @@ int register_device(const char *device,
goto_bad;
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvscan, sizeof(state->cmd_lvscan),
"lvscan --cache", device)) {
dmeventd_lvm2_exit_with_pool(state);
"lvscan --cache", device))
goto_bad;
}
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
"lvconvert --repair --use-policies", device)) {
dmeventd_lvm2_exit_with_pool(state);
"lvconvert --repair --use-policies", device))
goto_bad;
}
*user = state;
@ -203,6 +199,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor mirror %s.", device);
if (state)
dmeventd_lvm2_exit_with_pool(state);
return 0;
}

7
daemons/dmeventd/plugins/raid/dmeventd_raid.c
View File

@ -140,10 +140,8 @@ int register_device(const char *device,
"lvscan --cache", device) ||
!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
"lvconvert --config devices{ignore_suspended_devices=1} "
"--repair --use-policies", device)) {
dmeventd_lvm2_exit_with_pool(state);
"--repair --use-policies", device))
goto_bad;
}
*user = state;
@ -153,6 +151,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor RAID %s.", device);
if (state)
dmeventd_lvm2_exit_with_pool(state);
return 0;
}

7
daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
View File

@ -254,10 +254,8 @@ int register_device(const char *device,
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvextend,
sizeof(state->cmd_lvextend),
"lvextend --use-policies", device)) {
dmeventd_lvm2_exit_with_pool(state);
"lvextend --use-policies", device))
goto_bad;
}
state->percent_check = CHECK_MINIMUM;
*user = state;
@ -268,6 +266,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor snapshot %s.", device);
if (state)
dmeventd_lvm2_exit_with_pool(state);
return 0;
}

7
daemons/dmeventd/plugins/thin/dmeventd_thin.c
View File

@ -359,10 +359,8 @@ int register_device(const char *device,
goto_bad;
if (!dmeventd_lvm2_command(state->mem, cmd_str, sizeof(cmd_str),
"_dmeventd_thin_command", device)) {
dmeventd_lvm2_exit_with_pool(state);
"_dmeventd_thin_command", device))
goto_bad;
}
if (strncmp(cmd_str, "lvm ", 4) == 0) {
if (!(state->cmd_str = dm_pool_strdup(state->mem, cmd_str + 4))) {
@ -401,6 +399,9 @@ inval:
bad:
log_error("Failed to monitor thin pool %s.", device);
if (state)
dmeventd_lvm2_exit_with_pool(state);
return 0;
}