fix metadata backup description for long lived process
PATCH 3/3 fix metadata backup description for long lived process
Fix metadata backup description for long lived process.
If backup is run from clvmd (or long lived process), the *before* and *after* makes no sense, because commandline is always "clvmd" :-)
Signed-off-by Milan Broz <[email protected]>
--- lib/format_text/archiver.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-)
lib/format_text/archiver.c +12 -9
@@ -75,27 +75,30 @@ void archive_enable(struct cmd_context *cmd, int flag) cmd->archive_params->enabled = flag; } -static char *_build_desc (struct dm_pool *mem,const char *line,int before) +static char *_build_desc (struct cmd_context *cmd,int before) { -size_t len =strlen (line) +32 ; +size_t len =strlen (cmd->cmd_line) +32 ;char *buffer; +int ret; -if (!(buffer =dm_pool_zalloc (mem,strlen (line) +32 ))) +if (!(buffer =dm_pool_zalloc (cmd->mem,strlen (cmd->cmd_line) +32 ))) return_NULL; -if (snprintf (buffer, len, +if (cmd->is_long_lived) + ret =snprintf (buffer, len,"Created by %s" , cmd->cmd_line); +else + ret =snprintf (buffer, len,"Created %s executing '%s'" , - before ?"*before*" :"*after*" , line) <0 ) - return_NULL; + before ?"*before*" :"*after*" , cmd->cmd_line); -return buffer; +return (ret <0 ) ?NULL : buffer; }static int __archive (struct volume_group *vg) {char *desc; -if (!(desc =_build_desc (vg->cmd->mem, vg->cmd->cmd_line,1 ))) +if (!(desc =_build_desc (vg->cmd,1 ))) return_0; return archive_vg(vg, vg->cmd->archive_params->dir, desc,
@@ -190,7 +193,7 @@ static int __backup(struct volume_group *vg)char name[PATH_MAX ];char *desc; -if (!(desc =_build_desc (vg->cmd->mem, vg->cmd->cmd_line,0 ))) +if (!(desc =_build_desc (vg->cmd,0 ))) return_0; if (dm_snprintf(name, sizeof(name), "%s/%s",