Attachment 625741 Details for Bug 813766 – lvmetad_warn.diff

[patch] lvmetad_warn.diff

lvmetad_warn.diff (text/plain), 1.90 KB, created by Petr Rockai on 2012-10-12 00:51:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Rockai

Created: 2012-10-12 00:51:00 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
>index 18794be..f4f1fa3 100644
>--- a/lib/cache/lvmetad.c
>+++ b/lib/cache/lvmetad.c
>@@ -49,11 +49,16 @@ void lvmetad_init(struct cmd_context *cmd)
> 		if (_lvmetad.socket_fd >= 0 && !_lvmetad.error) {
> 			_lvmetad_connected = 1;
> 			_lvmetad_cmd = cmd;
>-		} else
>-			log_warn("WARNING: Failed to connect to lvmetad: %s. Falling back to internal scanning.", strerror(_lvmetad.error));
>+		}
> 	}
> }
> 
>+void lvmetad_warning()
>+{
>+	log_warn("WARNING: Failed to connect to lvmetad: %s. Falling back to internal scanning.",
>+		 strerror(_lvmetad.error));
>+}
>+
> int lvmetad_active(void)
> {
> 	return _lvmetad_use && _lvmetad_connected;
>diff --git a/lib/cache/lvmetad.h b/lib/cache/lvmetad.h
>index 10c4b13..f6e7b67 100644
>--- a/lib/cache/lvmetad.h
>+++ b/lib/cache/lvmetad.h
>@@ -48,6 +48,9 @@ void lvmetad_set_socket(const char *);
>  */
> int lvmetad_active(void);
> 
>+/* Print a warning if lvmetad is enabled but we failed to connect. */
>+void lvmetad_warning(void);
>+
> /*
>  * Drop connection to lvmetad. A subsequent lvmetad_init() will re-establish
>  * the connection (possibly at a different socket path).
>@@ -137,6 +140,7 @@ int lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler handler)
> #    define lvmetad_set_active(a)	do { } while (0)
> #    define lvmetad_set_socket(a)	do { } while (0)
> #    define lvmetad_active()	(0)
>+#    define lvmetad_warning()	do { } while (0)
> #    define lvmetad_set_token(a)	do { } while (0)
> #    define lvmetad_vg_update(vg)	(1)
> #    define lvmetad_vg_remove(vg)	(1)
>diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
>index bccf7a6..efcefe3 100644
>--- a/tools/lvmcmdline.c
>+++ b/tools/lvmcmdline.c
>@@ -876,6 +876,9 @@ static int _get_settings(struct cmd_context *cmd)
> 	else
> 		init_ignorelockingfailure(0);
> 
>+	if (!arg_count(cmd, sysinit_ARG))
>+		lvmetad_warning();
>+
> 	if (arg_count(cmd, nosuffix_ARG))
> 		cmd->current_settings.suffix = 0;
>

Actions: View | Diff

Attachments on bug 813766: 625741