fix clvmd metadata backup
PATCH 1/2 fix clvmd metadata backup
Fix remote metadata backup for clvmd
Currently the remote metadata backup doesn't work, because we added
if (clvmd_cmd == CLVMD_CMD_LOCK_VG &&
((flags & LCK_TYPE_MASK) == LCK_UNLOCK) &&
(flags & LCK_CLUSTER_VG)) {
... call the remote backup commandLCK_CLUSTER_VG is never set during LCK_UNLOCK, unlock_vg() takes only vgname as argument and cannot distinguish if vg is clustered, leaving flag unset (that flag is set only if locking LV).
The idea is call remote backup from archiver directly, here from backup() call.
If called from clvmd, the new flag is set to perform only local_backup.
Lock is now trigered by LCK_VG_BACKUP flag combination (I hope unused one:-).
--- daemons/clvmd/clvmd-command.c | 6 +++++- lib/format_text/archiver.c | 13 +++++++++++-- lib/locking/cluster_locking.c | 15 +++++++-------- lib/locking/locking.h | 3 +++ 4 files changed, 26 insertions(+), 11 deletions(-)
daemons/clvmd/clvmd-command.c +5 -1
@@ -159,7 +159,11 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,break ;case CLVMD_CMD_VG_BACKUP : -lvm_do_backup (&args[2 ]); +/* +* Do not run backup on local node, caller should do that. +*/ +if (!client) +lvm_do_backup (&args[2 ]);break ;default :
lib/format_text/archiver.c +11 -2
@@ -20,6 +20,7 @@#include "lvm-string.h" #include "lvmcache.h" #include "toolcontext.h" +#include "locking.h" #include <unistd.h>
@@ -202,7 +203,7 @@ static int __backup(struct volume_group *vg)return backup_to_file (name, desc, vg); } -int backup (struct volume_group *vg) +static int _backup (struct volume_group *vg,int local_only) {if (!vg->cmd->backup_params->enabled || !vg->cmd->backup_params->dir) {log_warn ("WARNING: This metadata update is NOT backed up" );
@@ -222,6 +223,9 @@ int backup(struct volume_group *vg) (errno == EROFS))return 0 ; +if (!local_only &&vg_is_clustered (vg)) +remote_backup_metadata (vg); +if (!__backup (vg)) {log_error ("Backup of volume group %s metadata failed." , vg->name);
@@ -231,6 +235,11 @@ int backup(struct volume_group *vg)return 1 ; } +int backup (struct volume_group *vg) +{ +return _backup (vg,0 ); +} +int backup_remove (struct cmd_context *cmd,const char *vg_name) {char path[PATH_MAX ];
@@ -426,5 +435,5 @@ void check_current_backup(struct volume_group *vg)vg_release (vg_backup); }archive (vg); -backup (vg); +_backup (vg,1 ); }
lib/locking/cluster_locking.c +7 -8
@@ -385,6 +385,13 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)switch (flags &LCK_SCOPE_MASK ) {case LCK_VG : +if (flags ==LCK_VG_BACKUP ) { +log_very_verbose ("Requesting backup of VG metadata for %s" , + resource); +return _lock_for_cluster (CLVMD_CMD_VG_BACKUP , +LCK_CLUSTER_VG , resource); + } +/* If the VG name is empty then lock the unused PVs */ if (*resource =='#' || (flags &LCK_CACHE )) dm_snprintf(lockname, sizeof(lockname), "P_%s",
@@ -436,14 +443,6 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)return 0 ; } -/* If we are unlocking a clustered VG, then trigger remote metadata backups */ -if (clvmd_cmd ==CLVMD_CMD_LOCK_VG && - ((flags &LCK_TYPE_MASK ) ==LCK_UNLOCK ) && - (flags &LCK_CLUSTER_VG )) { -log_very_verbose ("Requesing backup of VG metadata for %s" , resource); -_lock_for_cluster (CLVMD_CMD_VG_BACKUP ,LCK_CLUSTER_VG , resource); - } - log_very_verbose("Locking %s %s %s %s%s%s%s (0x%x)", lock_scope, lockname, lock_type, flags & LCK_NONBLOCK ? "" : "B",
lib/locking/locking.h +3 -0
@@ -101,6 +101,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);#define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD)#define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK)#define LCK_VG_DROP_CACHE (LCK_VG | LCK_WRITE | LCK_CACHE) +#define LCK_VG_BACKUP (LCK_VG | LCK_CACHE)#define LCK_LV_EXCLUSIVE (LCK_LV | LCK_EXCL | LCK_NONBLOCK)#define LCK_LV_SUSPEND (LCK_LV | LCK_WRITE | LCK_NONBLOCK)
@@ -131,6 +132,8 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); lock_lv_vol(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL)#define drop_cached_metadata (vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE) +#define remote_backup_metadata (vg) \ + lock_vol((vg)->cmd, (vg)->name, LCK_VG_BACKUP)/* Process list of LVs */ int suspend_lvs (struct cmd_context *cmd,struct dm_list *lvs);
PATCH v3 1/1 fix clvmd metadata backup
Fix remote metadata backup for clvmd
Run backup of metadata on remote nodes in the same place like local node - when calling backup().
Introduce backup_locally() which calls only local backup if needed.
Remote backup is now trigerred by LCK_VG_BACKUP flag combination (special VG lock).
This lock type will call check_current_backup() (including backup_locally() call) and updates metadata on all nodes.
(Patch fixes non-functional remote backup, current call during VG lock never triggers.)
--- daemons/clvmd/clvmd-command.c | 6 +++++- lib/format_text/archiver.c | 13 +++++++++++-- lib/format_text/archiver.h | 1 + lib/locking/cluster_locking.c | 15 +++++++-------- lib/locking/locking.h | 3 +++ 5 files changed, 27 insertions(+), 11 deletions(-)
daemons/clvmd/clvmd-command.c +5 -1
@@ -159,7 +159,11 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,break ;case CLVMD_CMD_VG_BACKUP : -lvm_do_backup (&args[2 ]); +/* +* Do not run backup on local node, caller should do that. +*/ +if (!client) +lvm_do_backup (&args[2 ]);break ;default :
lib/format_text/archiver.c +11 -2
@@ -20,6 +20,7 @@#include "lvm-string.h" #include "lvmcache.h" #include "toolcontext.h" +#include "locking.h" #include <unistd.h>
@@ -202,7 +203,7 @@ static int __backup(struct volume_group *vg)return backup_to_file (name, desc, vg); } -int backup (struct volume_group *vg) +int backup_locally (struct volume_group *vg) {if (!vg->cmd->backup_params->enabled || !vg->cmd->backup_params->dir) {log_warn ("WARNING: This metadata update is NOT backed up" );
@@ -231,6 +232,14 @@ int backup(struct volume_group *vg)return 1 ; } +int backup (struct volume_group *vg) +{ +if (vg_is_clustered (vg)) +remote_backup_metadata (vg); + +return backup_locally (vg); +} +int backup_remove (struct cmd_context *cmd,const char *vg_name) {char path[PATH_MAX ];
@@ -426,5 +435,5 @@ void check_current_backup(struct volume_group *vg)vg_release (vg_backup); }archive (vg); -backup (vg); +backup_locally (vg); }
lib/format_text/archiver.h +1 -0
@@ -46,6 +46,7 @@ void backup_exit(struct cmd_context *cmd);void backup_enable (struct cmd_context *cmd,int flag);int backup (struct volume_group *vg); +int backup_locally (struct volume_group *vg);int backup_remove (struct cmd_context *cmd,const char *vg_name); struct volume_group *backup_read_vg(struct cmd_context *cmd,
lib/locking/cluster_locking.c +7 -8
@@ -385,6 +385,13 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)switch (flags &LCK_SCOPE_MASK ) {case LCK_VG : +if (flags ==LCK_VG_BACKUP ) { +log_very_verbose ("Requesting backup of VG metadata for %s" , + resource); +return _lock_for_cluster (CLVMD_CMD_VG_BACKUP , +LCK_CLUSTER_VG , resource); + } +/* If the VG name is empty then lock the unused PVs */ if (*resource =='#' || (flags &LCK_CACHE )) dm_snprintf(lockname, sizeof(lockname), "P_%s",
@@ -436,14 +443,6 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)return 0 ; } -/* If we are unlocking a clustered VG, then trigger remote metadata backups */ -if (clvmd_cmd ==CLVMD_CMD_LOCK_VG && - ((flags &LCK_TYPE_MASK ) ==LCK_UNLOCK ) && - (flags &LCK_CLUSTER_VG )) { -log_very_verbose ("Requesing backup of VG metadata for %s" , resource); -_lock_for_cluster (CLVMD_CMD_VG_BACKUP ,LCK_CLUSTER_VG , resource); - } - log_very_verbose("Locking %s %s %s %s%s%s%s (0x%x)", lock_scope, lockname, lock_type, flags & LCK_NONBLOCK ? "" : "B",
lib/locking/locking.h +3 -0
@@ -101,6 +101,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);#define LCK_VG_WRITE (LCK_VG | LCK_WRITE | LCK_HOLD)#define LCK_VG_UNLOCK (LCK_VG | LCK_UNLOCK)#define LCK_VG_DROP_CACHE (LCK_VG | LCK_WRITE | LCK_CACHE) +#define LCK_VG_BACKUP (LCK_VG | LCK_CACHE)#define LCK_LV_EXCLUSIVE (LCK_LV | LCK_EXCL | LCK_NONBLOCK)#define LCK_LV_SUSPEND (LCK_LV | LCK_WRITE | LCK_NONBLOCK)
@@ -131,6 +132,8 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); lock_lv_vol(cmd, lv, LCK_LV_DEACTIVATE | LCK_LOCAL)#define drop_cached_metadata (vg) \ lock_vol((vg)->cmd, (vg)->name, LCK_VG_DROP_CACHE) +#define remote_backup_metadata (vg) \ + lock_vol((vg)->cmd, (vg)->name, LCK_VG_BACKUP)/* Process list of LVs */ int suspend_lvs (struct cmd_context *cmd,struct dm_list *lvs);
PATCH v3 1/1 fix clvmd metadata backup
Quoted 3 lines · Milan Broz
Fix remote metadata backup for clvmd
Run backup of metadata on remote nodes in the same place like local node - when callingbackup().
Ack for now - it needs some decent testing though (incl. checking the 'description' field contents are accurate).
Eventually I'd like all the backups pushing through the locking code, but that would mean passing the description field around so we don't lose it.
Alasdair
Signature · 1 line
agk at redhat.com