Attachment 908001 Details for Bug 1108525 – logsys: Log warning if flightrecorder init fails

[patch] logsys: Log warning if flightrecorder init fails

tmp.td35MkwvUA (text/plain), 1.96 KB, created by Jan Friesse on 2014-06-12 08:03:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-06-12 08:03:03 UTC

Size: 1.96 KB

patch

obsolete

>From 8f13a983204c2bc16c7490cee6db90138ecc43f1 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Tue, 27 May 2014 17:29:13 +0200
>Subject: [PATCH] logsys: Log warning if flightrecorder init fails
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
>---
> exec/logsys.c |   17 ++++++++++++++++-
> 1 files changed, 16 insertions(+), 1 deletions(-)
>
>diff --git a/exec/logsys.c b/exec/logsys.c
>index 8270da7..6b4995d 100644
>--- a/exec/logsys.c
>+++ b/exec/logsys.c
>@@ -309,6 +309,7 @@ int _logsys_system_setup(
> 	int i;
> 	int32_t fidx;
> 	char tempsubsys[LOGSYS_MAX_SUBSYS_NAMELEN];
>+	int blackbox_enable_res;
> 
> 	if ((mainsystem == NULL) ||
> 	    (strlen(mainsystem) >= LOGSYS_MAX_SUBSYS_NAMELEN)) {
>@@ -333,6 +334,12 @@ int _logsys_system_setup(
> 	 * _logsys_subsys_filename_add (i, "util.c");
> 	 */
> 
>+	/*
>+	 * This file (logsys.c) is not exactly QB. We need tag for logsys.c if flightrecorder init
>+	 * fails, and QB seems to be closest.
>+	 */
>+	_logsys_subsys_filename_add (i, "logsys.c");
>+
> 	i = LOGSYS_MAX_SUBSYS_COUNT;
> 
> 	pthread_mutex_lock (&logsys_config_mutex);
>@@ -364,7 +371,7 @@ int _logsys_system_setup(
> 			  QB_LOG_FILTER_FILE, "*", LOG_TRACE);
> 	qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_SIZE, IPC_LOGSYS_SIZE);
> 	qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_THREADED, QB_FALSE);
>-	qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_TRUE);
>+	blackbox_enable_res = qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_TRUE);
> 
> 	if (logsys_format_set(NULL) == -1) {
> 		return -1;
>@@ -390,6 +397,14 @@ int _logsys_system_setup(
> 		}
> 	}
> 
>+	if (blackbox_enable_res < 0) {
>+		LOGSYS_PERROR (-blackbox_enable_res, LOGSYS_LEVEL_WARNING,
>+		    "Unable to initialize log flight recorder. "\
>+		    "The most common cause of this error is " \
>+		    "not enough space on /dev/shm. Corosync will continue work, " \
>+		    "but blackbox will not be available");
>+	}
>+
> 	pthread_mutex_unlock (&logsys_config_mutex);
> 
> 	return (0);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108525: 908000 | 908001 | 908002 | 908003