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

lvmcache: include system_id in vginfo cache

Browse Source 
Save system_id just like creation_host and lock_type
strings in vginfo cache.
This commit is contained in:
David Teigland 2015-11-30 11:32:17 -06:00
parent 1f357532bb
commit d3ca18e489
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/cache/lvmcache.c vendored
View File

@ -56,6 +56,7 @@ struct lvmcache_vginfo {
char _padding[7]; char _padding[7];
struct lvmcache_vginfo *next; /* Another VG with same name? */ struct lvmcache_vginfo *next; /* Another VG with same name? */
char *creation_host; char *creation_host;
char *system_id;
char *lock_type; char *lock_type;
uint32_t mda_checksum; uint32_t mda_checksum;
size_t mda_size; size_t mda_size;
@ -1448,7 +1449,8 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info,
} }
static int _lvmcache_update_vgstatus(struct lvmcache_info *info, uint32_t vgstatus, static int _lvmcache_update_vgstatus(struct lvmcache_info *info, uint32_t vgstatus,
const char *creation_host, const char *lock_type) const char *creation_host, const char *lock_type,
const char *system_id)
{ {
if (!info || !info->vginfo) if (!info || !info->vginfo)
return 1; return 1;
@ -1482,20 +1484,41 @@ static int _lvmcache_update_vgstatus(struct lvmcache_info *info, uint32_t vgstat
set_lock_type: set_lock_type:
if (!lock_type) if (!lock_type)
goto out; goto set_system_id;
if (info->vginfo->lock_type && !strcmp(lock_type, info->vginfo->lock_type)) if (info->vginfo->lock_type && !strcmp(lock_type, info->vginfo->lock_type))
goto out; goto set_system_id;
if (info->vginfo->lock_type) if (info->vginfo->lock_type)
dm_free(info->vginfo->lock_type); dm_free(info->vginfo->lock_type);
if (!(info->vginfo->lock_type = dm_strdup(lock_type))) { if (!(info->vginfo->lock_type = dm_strdup(lock_type))) {
log_error("cache creation host alloc failed for %s", log_error("cache lock_type alloc failed for %s", lock_type);
lock_type);
return 0; return 0;
} }
log_debug_cache("lvmcache: %s: VG %s: Set lock_type to %s.",
dev_name(info->dev), info->vginfo->vgname, lock_type);
set_system_id:
if (!system_id)
goto out;
if (info->vginfo->system_id && !strcmp(system_id, info->vginfo->system_id))
goto out;
if (info->vginfo->system_id)
dm_free(info->vginfo->system_id);
if (!(info->vginfo->system_id = dm_strdup(system_id))) {
log_error("cache system_id alloc failed for %s", system_id);
return 0;
}
log_debug_cache("lvmcache: %s: VG %s: Set system_id to %s.",
dev_name(info->dev), info->vginfo->vgname, system_id);
out: out:
return 1; return 1;
} }
@ -1561,7 +1584,7 @@ int lvmcache_update_vgname_and_id(struct lvmcache_info *info, struct lvmcache_vg
if (!_lvmcache_update_vgname(info, vgname, vgid, vgsummary->vgstatus, if (!_lvmcache_update_vgname(info, vgname, vgid, vgsummary->vgstatus,
vgsummary->creation_host, info->fmt) || vgsummary->creation_host, info->fmt) ||
!_lvmcache_update_vgid(info, info->vginfo, vgid) || !_lvmcache_update_vgid(info, info->vginfo, vgid) ||
!_lvmcache_update_vgstatus(info, vgsummary->vgstatus, vgsummary->creation_host, vgsummary->lock_type) || !_lvmcache_update_vgstatus(info, vgsummary->vgstatus, vgsummary->creation_host, vgsummary->lock_type, vgsummary->system_id) ||
!_lvmcache_update_vg_mda_info(info, vgsummary->mda_checksum, vgsummary->mda_size)) !_lvmcache_update_vg_mda_info(info, vgsummary->mda_checksum, vgsummary->mda_size))
return_0; return_0;
@ -1577,6 +1600,7 @@ int lvmcache_update_vg(struct volume_group *vg, unsigned precommitted)
.vgname = vg->name, .vgname = vg->name,
.vgstatus = vg->status, .vgstatus = vg->status,
.vgid = vg->id, .vgid = vg->id,
.system_id = vg->system_id,
.lock_type = vg->lock_type .lock_type = vg->lock_type
}; };

1
lib/cache/lvmcache.h vendored
View File

@ -55,6 +55,7 @@ struct lvmcache_vgsummary {
struct id vgid; struct id vgid;
uint64_t vgstatus; uint64_t vgstatus;
char *creation_host; char *creation_host;
const char *system_id;
const char *lock_type; const char *lock_type;
uint32_t mda_checksum; uint32_t mda_checksum;
size_t mda_size; size_t mda_size;

7
lib/format_text/import_vsn1.c
View File

@ -1042,6 +1042,7 @@ static int _read_vgname(const struct format_type *fmt, const struct dm_config_tr
{ {
const struct dm_config_node *vgn; const struct dm_config_node *vgn;
struct dm_pool *mem = fmt->cmd->mem; struct dm_pool *mem = fmt->cmd->mem;
const char *str;
int old_suppress; int old_suppress;
old_suppress = log_suppress(2); old_suppress = log_suppress(2);
@ -1073,7 +1074,11 @@ static int _read_vgname(const struct format_type *fmt, const struct dm_config_tr
return 0; return 0;
} }
dm_config_get_str(vgn, "lock_type", &vgsummary->lock_type); if (dm_config_get_str(vgn, "system_id", &str))
vgsummary->system_id = dm_pool_strdup(mem, str);
if (dm_config_get_str(vgn, "lock_type", &str))
vgsummary->lock_type = dm_pool_strdup(mem, str);
return 1; return 1;
} }