shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Save and restore the previous logging level when log level is changed.

Browse Source
This commit is contained in:
Takahiro Yasui 2009-04-02 21:34:41 +00:00
parent e69246e1b7
commit 2691077d90
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.46 - Version 2.02.46 -
================================ ================================
Save and restore the previous logging level when log level is changed.
Fix error message when archive initialization fails. Fix error message when archive initialization fails.
Make sure clvmd-corosync releases the lockspace when it exits. Make sure clvmd-corosync releases the lockspace when it exits.
Fix segfault for vgcfgrestore on VG with missing PVs. Fix segfault for vgcfgrestore on VG with missing PVs.

7
lib/format_text/archiver.c
View File

@ -397,6 +397,7 @@ void check_current_backup(struct volume_group *vg)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
struct volume_group *vg_backup; struct volume_group *vg_backup;
int old_suppress;
if (vg->status & EXPORTED_VG) if (vg->status & EXPORTED_VG)
return; return;
@ -407,15 +408,15 @@ void check_current_backup(struct volume_group *vg)
return; return;
} }
log_suppress(1); old_suppress = log_suppress(1);
/* Up-to-date backup exists? */ /* Up-to-date backup exists? */
if ((vg_backup = backup_read_vg(vg->cmd, vg->name, path)) && if ((vg_backup = backup_read_vg(vg->cmd, vg->name, path)) &&
(vg->seqno == vg_backup->seqno) && (vg->seqno == vg_backup->seqno) &&
(id_equal(&vg->id, &vg_backup->id))) { (id_equal(&vg->id, &vg_backup->id))) {
log_suppress(0); log_suppress(old_suppress);
return; return;
} }
log_suppress(0); log_suppress(old_suppress);
if (vg_backup) if (vg_backup)
archive(vg_backup); archive(vg_backup);

5
lib/format_text/import_vsn1.c
View File

@ -816,10 +816,11 @@ static void _read_desc(struct dm_pool *mem,
{ {
const char *d; const char *d;
unsigned int u = 0u; unsigned int u = 0u;
int old_suppress;
log_suppress(1); old_suppress = log_suppress(1);
d = find_config_str(cft->root, "description", ""); d = find_config_str(cft->root, "description", "");
log_suppress(0); log_suppress(old_suppress);
*desc = dm_pool_strdup(mem, d); *desc = dm_pool_strdup(mem, d);
get_config_uint32(cft->root, "creation_time", &u); get_config_uint32(cft->root, "creation_time", &u);

9
lib/snapshot/snapshot.c
View File

@ -37,6 +37,7 @@ static int _snap_text_import(struct lv_segment *seg, const struct config_node *s
uint32_t chunk_size; uint32_t chunk_size;
const char *org_name, *cow_name; const char *org_name, *cow_name;
struct logical_volume *org, *cow; struct logical_volume *org, *cow;
int old_suppress;
seg->lv->status |= SNAPSHOT; seg->lv->status |= SNAPSHOT;
@ -45,21 +46,21 @@ static int _snap_text_import(struct lv_segment *seg, const struct config_node *s
return 0; return 0;
} }
log_suppress(1); old_suppress = log_suppress(1);
if (!(cow_name = find_config_str(sn, "cow_store", NULL))) { if (!(cow_name = find_config_str(sn, "cow_store", NULL))) {
log_suppress(0); log_suppress(old_suppress);
log_error("Snapshot cow storage not specified."); log_error("Snapshot cow storage not specified.");
return 0; return 0;
} }
if (!(org_name = find_config_str(sn, "origin", NULL))) { if (!(org_name = find_config_str(sn, "origin", NULL))) {
log_suppress(0); log_suppress(old_suppress);
log_error("Snapshot origin not specified."); log_error("Snapshot origin not specified.");
return 0; return 0;
} }
log_suppress(0); log_suppress(old_suppress);
if (!(cow = find_lv(seg->lv->vg, cow_name))) { if (!(cow = find_lv(seg->lv->vg, cow_name))) {
log_error("Unknown logical volume specified for " log_error("Unknown logical volume specified for "