shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvmetad: Init lazily, to avoid socket access on config overrides.

Browse Source
This commit is contained in:
Petr Rockai 2012-10-29 21:39:46 +01:00
parent 7c59199d49
commit 983f0b46f2
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/cache/lvmetad.c vendored
View File

@ -33,7 +33,8 @@ static struct cmd_context *_lvmetad_cmd = NULL;
void lvmetad_disconnect(void)
{
daemon_close(_lvmetad);
if (_lvmetad_connected)
daemon_close(_lvmetad);
_lvmetad_connected = 0;
_lvmetad_cmd = NULL;
}
@ -41,19 +42,25 @@ void lvmetad_disconnect(void)
void lvmetad_init(struct cmd_context *cmd)
{
if (!_lvmetad_use && !access(LVMETAD_PIDFILE, F_OK))
log_warn("WARNING: lvmetad is running but disabled. Restart lvmetad before enabling it!");
log_warn("WARNING: lvmetad is running but disabled."
" Restart lvmetad before enabling it!");
_lvmetad_cmd = cmd;
}
static void _lvmetad_connect()
{
if (_lvmetad_use && _lvmetad_socket && !_lvmetad_connected) {
assert(_lvmetad_socket);
_lvmetad = lvmetad_open(_lvmetad_socket);
if (_lvmetad.socket_fd >= 0 && !_lvmetad.error) {
if (_lvmetad.socket_fd >= 0 && !_lvmetad.error)
_lvmetad_connected = 1;
_lvmetad_cmd = cmd;
}
}
}
void lvmetad_warning(void)
{
if (!_lvmetad_connected)
_lvmetad_connect();
if (_lvmetad_use && (_lvmetad.socket_fd < 0 || _lvmetad.error))
log_warn("WARNING: Failed to connect to lvmetad: %s. Falling back to internal scanning.",
strerror(_lvmetad.error));
@ -61,7 +68,11 @@ void lvmetad_warning(void)
int lvmetad_active(void)
{
return _lvmetad_use && _lvmetad_connected;
if (!_lvmetad_use)
return 0;
if (!_lvmetad_connected)
_lvmetad_connect();
return _lvmetad_connected;
}
void lvmetad_set_active(int active)
@ -873,6 +884,11 @@ int lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler handler)
char *future_token;
int was_silent;
if (!lvmetad_active()) {
log_error("Cannot proceed since lvmetad is not active.");
return 0;
}
if (!(iter = dev_iter_create(cmd->lvmetad_filter, 1))) {
log_error("dev_iter creation failed");
return 0;