cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: lhh@sourceware.org <lhh@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c
Date: 27 Sep 2006 16:32:13 -0000	[thread overview]
Message-ID: <20060927163213.13775.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2006-09-27 16:32:13

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Apply patch from Fabio M. Di Nitto to fix clustat service name expansion bug

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&r1=1.21&r2=1.22

--- cluster/rgmanager/ChangeLog	2006/09/27 16:28:41	1.25
+++ cluster/rgmanager/ChangeLog	2006/09/27 16:32:13	1.26
@@ -23,7 +23,8 @@
 	decide if we need to wait for a node to be fenced or not.  Fix
 	node ID type.
 	* src/utils/clustat.c: Fix logic error preventing nodes from properly
-	being flagged.
+	being flagged.  Apply patch from Fabio M. Di Nitto to fix bug where
+	clustat -s foo wasn't getting expanded to service:foo
 
 2006-09-01 Lon Hohberger <lhh@redhat.com>
 	* include/resgroup.h: Add proto for rg_strerror
--- cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:28:41	1.21
+++ cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:32:13	1.22
@@ -683,7 +683,7 @@
 	int refresh_sec = 0, errors = 0;
 	int opt, xml = 0, flags = 0;
 	char *member_name = NULL;
-	char *rg_name = NULL;
+	char *rg_name = NULL, real_rg_name[64];
 
 	while ((opt = getopt(argc, argv, "fIls:m:i:xvQh?")) != EOF) {
 		switch(opt) {
@@ -715,6 +715,9 @@
 
 		case 's':
 			rg_name = optarg;
+			if (!strchr(rg_name,':')) {
+				snprintf(real_rg_name, , sizeof(real_rg_name), "service:%s", rg_name);
+				rg_name = real_rg_name;
 			break;
 
 		case 'x':



             reply	other threads:[~2006-09-27 16:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-27 16:32 lhh [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-08-15 18:41 [Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c lhh
2007-08-15 18:43 lhh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060927163213.13775.qmail@sourceware.org \
    --to=lhh@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).