From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20672 invoked by alias); 21 May 2010 12:52:02 -0000 Received: (qmail 20651 invoked by uid 9737); 21 May 2010 12:52:02 -0000 Date: Fri, 21 May 2010 12:52:00 -0000 Message-ID: <20100521125202.20649.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/metadata/metadata-exporte ... Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-05/txt/msg00078.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-05-21 12:52:01 Modified files: . : WHATS_NEW lib/metadata : metadata-exported.h replicator_manip.c Log message: Replicator: add sorted cmd_vg list Introduce struct cmd_vg to store information about needed volume group name, vgid, flags and the pointer to opened VG. Keep VGs list in alphabetical order for locking order. Introduce functions: cmd_vg_add() add new cmd_vg entry. cmd_vg_lookup() search cmd_vgs for vg_name. cmd_vg_read() open VGs in cmd_vgs list. cmd_vg_release() close VGs in reversed order. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1582&r2=1.1583 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.148&r2=1.149 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/replicator_manip.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3 --- LVM2/WHATS_NEW 2010/05/21 12:45:18 1.1582 +++ LVM2/WHATS_NEW 2010/05/21 12:52:01 1.1583 @@ -1,5 +1,6 @@ Version 2.02.67 - =============================== + Add functions for handling cmd_vg structure. Extend _lv_each_dependency() with Replicator dependencies. Add check_replicator_segment() for catching internal Replicator errors. Initial lvm2 support for Replicator metadata handling. --- LVM2/lib/metadata/metadata-exported.h 2010/05/21 12:47:46 1.148 +++ LVM2/lib/metadata/metadata-exported.h 2010/05/21 12:52:01 1.149 @@ -298,6 +298,15 @@ struct segment_type; +/* List with vg_name, vgid and flags */ +struct cmd_vg { + struct dm_list list; + const char *vg_name; + const char *vgid; + uint32_t flags; + struct volume_group *vg; +}; + /* ++ Replicator datatypes */ typedef enum { REPLICATOR_STATE_PASSIVE, @@ -798,6 +807,13 @@ int lv_is_slog(const struct logical_volume *lv); struct logical_volume *first_replicator_dev(const struct logical_volume *lv); /* -- metadata/replicator_manip.c */ +struct cmd_vg *cmd_vg_add(struct dm_pool *mem, struct dm_list *cmd_vgs, + const char *vg_name, const char *vgid, + uint32_t flags); +struct cmd_vg *cmd_vg_lookup(struct dm_list *cmd_vgs, + const char *vg_name, const char *vgid); +int cmd_vg_read(struct cmd_context *cmd, struct dm_list *cmd_vgs); +void cmd_vg_release(struct dm_list *cmd_vgs); struct logical_volume *find_pvmove_lv(struct volume_group *vg, struct device *dev, uint32_t lv_type); --- LVM2/lib/metadata/replicator_manip.c 2010/05/21 12:43:02 1.2 +++ LVM2/lib/metadata/replicator_manip.c 2010/05/21 12:52:01 1.3 @@ -13,6 +13,7 @@ */ #include "lib.h" +#include "locking.h" #include "metadata.h" #include "segtype.h" @@ -477,3 +478,127 @@ return NULL; } + +/** + * Add VG open parameters to sorted cmd_vg list. + * + * Maintain the alphabeticaly ordered list, avoid duplications. + * + * \return Returns newly created or already present cmd_vg entry, + * or NULL in error case. + */ +struct cmd_vg *cmd_vg_add(struct dm_pool *mem, struct dm_list *cmd_vgs, + const char *vg_name, const char *vgid, + uint32_t flags) +{ + struct cmd_vg *cvl, *ins; + + if (!vg_name && !vgid) { + log_error("Either vg_name or vgid must be set."); + return NULL; + } + + /* Is it already in the list ? */ + if ((cvl = cmd_vg_lookup(cmd_vgs, vg_name, vgid))) + return cvl; + + if (!(cvl = dm_pool_zalloc(mem, sizeof(*cvl)))) { + log_error("Allocation of cmd_vg failed."); + return NULL; + } + + if (vg_name && !(cvl->vg_name = dm_pool_strdup(mem, vg_name))) { + dm_pool_free(mem, cvl); + log_error("Allocation of vg_name failed."); + return NULL; + } + + if (vgid && !(cvl->vgid = dm_pool_strdup(mem, vgid))) { + dm_pool_free(mem, cvl); + log_error("Allocation of vgid failed."); + return NULL; + } + + cvl->flags = flags; + + if (vg_name) + dm_list_iterate_items(ins, cmd_vgs) + if (strcmp(vg_name, ins->vg_name) < 0) { + cmd_vgs = &ins->list; /* new position */ + break; + } + + dm_list_add(cmd_vgs, &cvl->list); + + return cvl; +} + +/** + * Find cmd_vg with given vg_name in cmd_vgs list. + * + * \param cmd_vgs List of cmd_vg entries. + * + * \param vg_name Name of VG to be found. + + * \param vgid UUID of VG to be found. + * + * \return Returns cmd_vg entry if vg_name or vgid is found, + * NULL otherwise. + */ +struct cmd_vg *cmd_vg_lookup(struct dm_list *cmd_vgs, + const char *vg_name, const char *vgid) +{ + struct cmd_vg *cvl; + + dm_list_iterate_items(cvl, cmd_vgs) + if ((vgid && cvl->vgid && !strcmp(vgid, cvl->vgid)) || + (vg_name && cvl->vg_name && !strcmp(vg_name, cvl->vg_name))) + return cvl; + return NULL; +} + +/** + * Read and lock multiple VGs stored in cmd_vgs list alphabeticaly. + * On the success list head pointer is set to VGs' cmd_vgs. + * (supports FAILED_INCONSISTENT) + * + * \param cmd_vg Contains list of cmd_vg entries. + * + * \return Returns 1 if all VG in cmd_vgs list are correctly + * openned and locked, 0 otherwise. + */ +int cmd_vg_read(struct cmd_context *cmd, struct dm_list *cmd_vgs) +{ + struct cmd_vg *cvl; + + /* Iterate through alphabeticaly ordered cmd_vg list */ + dm_list_iterate_items(cvl, cmd_vgs) { + cvl->vg = vg_read(cmd, cvl->vg_name, cvl->vgid, cvl->flags); + if (vg_read_error(cvl->vg)) { + log_debug("Failed to vg_read %s", cvl->vg_name); + return 0; + } + cvl->vg->cmd_vgs = cmd_vgs; /* Make it usable in VG */ + } + + return 1; +} + +/** + * Release opened and locked VGs from list. + * + * \param cmd_vgs Contains list of cmd_vg entries. + */ +void cmd_vg_release(struct dm_list *cmd_vgs) +{ + struct cmd_vg *cvl; + + /* Backward iterate cmd_vg list */ + dm_list_iterate_back_items(cvl, cmd_vgs) { + if (vg_read_error(cvl->vg)) + vg_release(cvl->vg); + else + unlock_and_release_vg(cvl->vg->cmd, cvl->vg, cvl->vg_name); + cvl->vg = NULL; + } +}