Attachment 930511 Details for Bug 1108522 – Implement config file testing mode

[patch] Implement config file testing mode

tmp.vk3nzZVRFq (text/plain), 3.09 KB, created by Jan Friesse on 2014-08-25 14:36:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-08-25 14:36:10 UTC

Size: 3.09 KB

patch

obsolete

>From e3ffd4fedc8158cdb5057f9fe40b6459e3d85846 Mon Sep 17 00:00:00 2001
>From: Vladislav Bogdanov <bubble@hoster-ok.com>
>Date: Tue, 15 Jul 2014 12:45:40 +0000
>Subject: [PATCH] Implement config file testing mode
>
>Signed-off-by: Vladislav Bogdanov <bubble@hoster-ok.com>
>Reviewed-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/main.c    |   19 +++++++++++++++----
> man/corosync.8 |    3 +++
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/exec/main.c b/exec/main.c
>index be765de..0edd4bf 100644
>--- a/exec/main.c
>+++ b/exec/main.c
>@@ -1190,7 +1190,7 @@ int main (int argc, char **argv, char **envp)
> 	const char *error_string;
> 	struct totem_config totem_config;
> 	int res, ch;
>-	int background, setprio;
>+	int background, setprio, testonly;
> 	struct stat stat_out;
> 	enum e_corosync_done flock_err;
> 	uint64_t totem_config_warnings;
>@@ -1200,8 +1200,9 @@ int main (int argc, char **argv, char **envp)
> 	 */
> 	background = 1;
> 	setprio = 0;
>+	testonly = 0;
> 
>-	while ((ch = getopt (argc, argv, "fprv")) != EOF) {
>+	while ((ch = getopt (argc, argv, "fprtv")) != EOF) {
> 
> 		switch (ch) {
> 			case 'f':
>@@ -1212,6 +1213,9 @@ int main (int argc, char **argv, char **envp)
> 			case 'r':
> 				setprio = 1;
> 				break;
>+			case 't':
>+				testonly = 1;
>+				break;
> 			case 'v':
> 				printf ("Corosync Cluster Engine, version '%s'\n", VERSION);
> 				printf ("Copyright (c) 2006-2009 Red Hat, Inc.\n");
>@@ -1224,6 +1228,7 @@ int main (int argc, char **argv, char **envp)
> 					"usage:\n"\
> 					"        -f     : Start application in foreground.\n"\
> 					"        -p     : Does nothing.    \n"\
>+					"        -t     : Test configuration and exit.\n"\
> 					"        -r     : Set round robin realtime scheduling \n"\
> 					"        -v     : Display version and SVN revision of Corosync and exit.\n");
> 				logsys_system_fini();
>@@ -1283,8 +1288,10 @@ int main (int argc, char **argv, char **envp)
> 		corosync_exit_error (COROSYNC_DONE_LOGCONFIGREAD);
> 	}
> 
>-	log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Cluster Engine ('%s'): started and ready to provide service.", VERSION);
>-	log_printf (LOGSYS_LEVEL_INFO, "Corosync built-in features:" PACKAGE_FEATURES "");
>+	if (!testonly) {
>+		log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Cluster Engine ('%s'): started and ready to provide service.", VERSION);
>+		log_printf (LOGSYS_LEVEL_INFO, "Corosync built-in features:" PACKAGE_FEATURES "");
>+	}
> 
> 	/*
> 	 * Make sure required directory is present
>@@ -1336,6 +1343,10 @@ int main (int argc, char **argv, char **envp)
> 		corosync_exit_error (COROSYNC_DONE_MAINCONFIGREAD);
> 	}
> 
>+	if (testonly) {
>+		corosync_exit_error (COROSYNC_DONE_EXIT);
>+	}
>+
> 	ip_version = totem_config.ip_version;
> 
> 	totem_config.totem_memb_ring_id_create_or_load = corosync_ring_id_create_or_load;
>diff --git a/man/corosync.8 b/man/corosync.8
>index 59b2dda..559b392 100644
>--- a/man/corosync.8
>+++ b/man/corosync.8
>@@ -50,6 +50,9 @@ Does nothing (was: "Do not set process priority" - this is now the default).
> .B -r
> Set round robin realtime scheduling.
> .TP
>+.B -t
>+Test configuration and then exit.
>+.TP
> .B -v
> Display version and SVN revision of Corosync and exit.
> .SH SEE ALSO
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108522: 907995 | 907996 | 907997 | 907998 | 907999 | 908004 | 908111 | 930505 | 930506 | 930507 | 930509 | 930510 | 930511 | 930512 | 930513 | 930514 | 930515 | 930516 | 930517 | 930518 | 930519 | 930527 | 930528 | 930529 | 930530 | 930531 | 930535 | 930536 | 930537 | 930538 | 930539 | 930540 | 931024