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

lvmlockd: suppress error messages related to lvmetad

Browse Source 
Log lvmetad related messages as debug, not as errors,
when using lvmlockd without lvmetad.
This commit is contained in:
David Teigland 2018-05-18 16:00:54 -05:00
parent bc275bcddf
commit a9f2c1e1f5
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
daemons/lvmlockd/lvmlockd-core.c
View File

@ -1009,6 +1009,8 @@ static void add_work_action(struct action *act)
pthread_mutex_unlock(&worker_mutex); pthread_mutex_unlock(&worker_mutex);
} }
#define ERR_LVMETAD_NOT_RUNNING -200
static daemon_reply send_lvmetad(const char *id, ...) static daemon_reply send_lvmetad(const char *id, ...)
{ {
daemon_reply reply; daemon_reply reply;
@ -1029,9 +1031,9 @@ retry:
if (lvmetad_handle.error || lvmetad_handle.socket_fd < 0) { if (lvmetad_handle.error || lvmetad_handle.socket_fd < 0) {
err = lvmetad_handle.error ?: lvmetad_handle.socket_fd; err = lvmetad_handle.error ?: lvmetad_handle.socket_fd;
pthread_mutex_unlock(&lvmetad_mutex); pthread_mutex_unlock(&lvmetad_mutex);
log_error("lvmetad_open reconnect error %d", err); log_debug("lvmetad_open reconnect error %d", err);
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
reply.error = err; reply.error = ERR_LVMETAD_NOT_RUNNING;
va_end(ap); va_end(ap);
return reply; return reply;
} else { } else {
@ -1265,6 +1267,15 @@ static int res_lock(struct lockspace *ls, struct resource *r, struct action *act
* caches, and tell lvmetad to set global invalid to 0. * caches, and tell lvmetad to set global invalid to 0.
*/ */
/*
* lvmetad not running:
* Even if we have not previously found lvmetad running,
* we attempt to connect and invalidate in case it has
* been started while lvmlockd is running. We don't
* want to allow lvmetad to be used with invalid data if
* it happens to be enabled and started after lvmlockd.
*/
if (inval_meta && (r->type == LD_RT_VG)) { if (inval_meta && (r->type == LD_RT_VG)) {
daemon_reply reply; daemon_reply reply;
char *uuid; char *uuid;
@ -1284,8 +1295,10 @@ static int res_lock(struct lockspace *ls, struct resource *r, struct action *act
"version = " FMTd64, (int64_t)new_version, "version = " FMTd64, (int64_t)new_version,
NULL); NULL);
if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
log_error("set_vg_info in lvmetad failed %d", reply.error); if (reply.error != ERR_LVMETAD_NOT_RUNNING)
log_error("set_vg_info in lvmetad failed %d", reply.error);
}
daemon_reply_destroy(reply); daemon_reply_destroy(reply);
} }
@ -1300,8 +1313,10 @@ static int res_lock(struct lockspace *ls, struct resource *r, struct action *act
"global_invalid = " FMTd64, INT64_C(1), "global_invalid = " FMTd64, INT64_C(1),
NULL); NULL);
if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
log_error("set_global_info in lvmetad failed %d", reply.error); if (reply.error != ERR_LVMETAD_NOT_RUNNING)
log_error("set_global_info in lvmetad failed %d", reply.error);
}
daemon_reply_destroy(reply); daemon_reply_destroy(reply);
} }
@ -5848,7 +5863,7 @@ static int main_loop(daemon_state *ds_arg)
pthread_mutex_init(&lvmetad_mutex, NULL); pthread_mutex_init(&lvmetad_mutex, NULL);
lvmetad_handle = lvmetad_open(NULL); lvmetad_handle = lvmetad_open(NULL);
if (lvmetad_handle.error || lvmetad_handle.socket_fd < 0) if (lvmetad_handle.error || lvmetad_handle.socket_fd < 0)
log_error("lvmetad_open error %d", lvmetad_handle.error); log_debug("lvmetad_open error %d", lvmetad_handle.error);
else else
lvmetad_connected = 1; lvmetad_connected = 1;
@ -5856,8 +5871,13 @@ static int main_loop(daemon_state *ds_arg)
* Attempt to rejoin lockspaces and adopt locks from a previous * Attempt to rejoin lockspaces and adopt locks from a previous
* instance of lvmlockd that left behind lockspaces/locks. * instance of lvmlockd that left behind lockspaces/locks.
*/ */
if (adopt_opt) if (adopt_opt) {
adopt_locks(); /* FIXME: implement this without lvmetad */
if (!lvmetad_connected)
log_error("Cannot adopt locks without lvmetad running.");
else
adopt_locks();
}
while (1) { while (1) {
rv = poll(pollfd, pollfd_maxi + 1, -1); rv = poll(pollfd, pollfd_maxi + 1, -1);