[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-33-g3a37c3f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
The branch, master has been updated
via 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c (commit)
via d679b5fb411175c5c9346b1993de2956358254a8 (commit)
via e84a493caf0e64da936eeaa7fc3da0aa55024828 (commit)
from d33f4f1df3e8f84603418d0192c1af18794d3136 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Thu May 29 07:57:31 2008 +0200
[BUILD] Change build system to cope with new libgfscontrol
NOTE: you will need to rerun configure to set the new variables
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
commit d679b5fb411175c5c9346b1993de2956358254a8
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Thu May 29 07:57:03 2008 +0200
[GROUP] libgfscontrol: fix build with gcc-4.3
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
commit e84a493caf0e64da936eeaa7fc3da0aa55024828
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Thu May 29 07:56:04 2008 +0200
[GFS] remove symlink to umount.gfs2
umount.gfs2 is gone with commit d33f4f1df3e8f84603418d0192c1af18794d3136
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
---
Summary of changes:
configure | 14 ++
gfs/Makefile|5 ++---
group/Makefile |4 ++--
group/gfs_control/Makefile |7 ++-
group/gfs_controld/Makefile |5 +++--
group/libgfscontrol/main.c |1 +
make/defines.mk.input |2 ++
7 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index bc0203e..c2b648d 100755
--- a/configure
+++ b/configure
@@ -54,6 +54,8 @@ my %options = (
dlmlibdir => \$dlmlibdir,
dlmcontrolincdir => \$dlmcontrolincdir,
dlmcontrollibdir => \$dlmcontrollibdir,
+ gfscontrolincdir => \$gfscontrolincdir,
+ gfscontrollibdir => \$gfscontrollibdir,
fenceincdir => \$fenceincdir,
fencelibdir => \$fencelibdir,
fencedincdir => \$fenceincdir,
@@ -133,6 +135,8 @@ my $err = &GetOptions (\%options,
'dlmlibdir=s',
'dlmcontrolincdir=s',
'dlmcontrollibdir=s',
+ 'gfscontrolincdir=s',
+ 'gfscontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
'fencedincdir=s',
@@ -232,6 +236,8 @@ if ($help || !$err) {
print "--dlmlibdir=\tthe base directory for dlm libraries. (Default:
./dlm/libdlm)\n";
print "--dlmcontrolincdir=\tthe base directory for dlmcontrol include files.
(Default: ./dlm/libdlmcontrol)\n";
print "--dlmcontrollibdir=\tthe base directory for dlmcontrol libraries.
(Default: ./dlm/libdlmcontrol)\n";
+ print "--gfscontrolincdir=\tthe base directory for gfscontrol include files.
(Default: ./group/libgfscontrol)\n";
+ print "--gfscontrollibdir=\tthe base directory for gfscontrol libraries.
(Default: ./group/libgfscontrol)\n";
print "--fenceincdir=\tthe base directory for fence include files.
(Default: ./fence/libfence)\n";
print "--fencelibdir=\tthe base directory for fence libraries. (Default:
./fence/libfence)\n";
print "--fencedincdir=\tthe base directory for fenced include files.
(Default: ./fence/libfenced)\n";
@@ -445,6 +451,12 @@ if (!$dlmcontrolincdir) {
if (!$dlmcontrollibdir) {
$dlmcontrollibdir="${objdir}/dlm/libdlmcontrol";
}
+if (!$gfscontrolincdir) {
+ $gfscontrolincdir="${cdir}/group/libgfscontrol";
+}
+if (!$gfscontrollibdir) {
+ $gfscontrollibdir="${objdir}/group/libgfscontrol";
+}
if (!$fenceincdir) {
$fenceincdir="${cdir}/fence/libfence";
}
@@ -663,6 +675,8 @@ while () {
$_ =~ s/[EMAIL PROTECTED]@/$dlmlibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmcontrolincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmcontrollibdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$gfscontrolincdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$gfscontrollibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fenceincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fencelibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fencedincdir/;
diff --git a/gfs/Makefile b/gfs/Makefile
index 54ad93a..be44504 100644
--- a/gfs/Makefile
+++ b/gfs/Makefile
@@ -2,7 +2,7 @@
###
##
## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All right
[Cluster-devel] Cluster 2.03.03 released
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 The cluster team and its vibrant community are proud to announce the 5th release from the STABLE2 branch: 2.03.03. The STABLE2 branch collects, on a daily base, all bug fixes and the bare minimal changes required to run the cluster on top of the most recent Linux kernel (2.6.25) and rock solid openais (0.80.3 or higher). The new source tarball can be downloaded here: ftp://sources.redhat.com/pub/cluster/releases/cluster-2.03.03.tar.gz In order to use GFS1, the Linux kernel requires a minimal patch: ftp://sources.redhat.com/pub/cluster/releases/lockproto-exports.patch To report bugs or issues: https://bugzilla.redhat.com/ Would you like to meet the cluster team or members of its community? Join us on IRC (irc.freenode.net #linux-cluster) and share your experience with other sysadministrators or power users. Happy clustering, Fabio Under the hood (from 2.03.02): Bob Peterson (1): bz 446085: Back-port faster bitfit algorithm from gfs2 for better David Teigland (1): gfs_controld: ignore write(2) return value on plock dev Fabio M. Di Nitto (16): [RGMANAGER] ^M's are good for DOS, bad for UNIX [FENCE] Rename bladecenter as it should be .pl -> .py [CCS] Make a bunch of functions static [BUILD] Stop using DEVEL.DATE library soname [BUILD] Set soname to 2.3 [BUILD] Move fencelib in /usr/share [BUILD] Allow users to set path to init.d [BUILD] Add --without_kernel_modules configure option [GFS] Sync with gfs2 init script [MISC] Cast some love to init scripts [CMAN] Fix path to cman_tool [INIT] Do not start services automatically [MISC] Update copyright [BUILD] Fix sparc #ifdef according to the new gcc tables [BUILD] Fix rg_test linking [BUILD] Fix install permissions Jonathan Brassow (1): ger/lvm.sh: HA LVM wasn't working on IA64 Lon Hohberger (2): [cman] Fix infinite loop in several daemons [rgmanager] Fix #441582 - symlinks in mount points causing failures Marc - A. Dahlhaus (1): [MISC] Add version string to -V options of dlm_tool and group deamons Marek 'marx' Grac (8): [FENCE] SSH support using stdin options [FENCE] Fix #435154: Support for 24 port APC fencing device [FENCE] Fix name of the option in fencing library [FENCE] Fix problem with different menu for admin/user for APC [FENCE] Fix typo in name of the exceptions in fencing agents [FENCE] Fix #248609: SSH support in Bladecenter fencing (ssh) [FENCE] Fix #446995: Parse error: Unknown option 'switch=3' [FENCE] Fix #447378 - fence_apc unable to connect via ssh to APC 7900 ccs/lib/libccs.c |6 +- cman/init.d/cman.in | 27 +- cman/init.d/qdiskd| 19 +- cman/qdisk/disk_util.c|2 +- configure | 35 +- dlm/tool/main.c |4 +- fence/agents/apc/fence_apc.py | 112 ++- fence/agents/bladecenter/fence_bladecenter.pl | 90 -- fence/agents/bladecenter/fence_bladecenter.py | 90 ++ fence/agents/drac/fence_drac5.py |4 +- fence/agents/ilo/fence_ilo.py |4 +- fence/agents/lib/fencing.py.py| 55 +- fence/agents/scsi/scsi_reserve| 28 +- fence/agents/wti/fence_wti.py |4 +- gfs-kernel/src/gfs/bits.c | 85 +- gfs-kernel/src/gfs/bits.h |3 +- gfs-kernel/src/gfs/rgrp.c |3 +- gfs/init.d/gfs| 15 +- gfs2/init.d/gfs2 | 15 +- group/daemon/main.c |3 +- group/dlm_controld/main.c |5 +- group/gfs_controld/main.c |5 +- group/gfs_controld/plock.c|6 +- group/test/clientd.c |2 +- group/tool/main.c |4 +- make/defines.mk.input |5 +- make/install.mk |6 +- make/official_release_version |1 + make/uninstall.mk |2 +- rgmanager/include/platform.h |2 +- rgmanager/init.d/rgmanager.in | 15 +- rgmanager/src/clulib/vft.c|2 +- rgmanager/src/daemons/Makefile|2 +- rgmanager/src/resources/ASEHAagent.sh | 1786 rgmanager/src/resources/Makefile | 17 +- rgmanager/src/resources/clusterfs.sh |2 +- rgmanager/src/resources/fs.sh |2 +- rgmanager/src/resources/lvm.sh|2 +- rgmanager/src/resources/netfs.sh |2 +- scripts/fenceparse
[Cluster-devel] Cluster Project annotated tag, cluster-2.03.03, created. cluster-2.03.03
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=244564f0627c46a3f1dd1c1704174d79095093d7 The annotated tag, cluster-2.03.03 has been created at 244564f0627c46a3f1dd1c1704174d79095093d7 (tag) tagging 8a7314ea3f3d30cbf10b127fc5516a078d000adc (commit) replaces cluster-2.03.02 tagged by Fabio M. Di Nitto on Thu May 29 06:05:45 2008 +0200 - Log - cluster-2.03.03 release Bob Peterson (1): bz 446085: Back-port faster bitfit algorithm from gfs2 for better David Teigland (1): gfs_controld: ignore write(2) return value on plock dev Fabio M. Di Nitto (16): [RGMANAGER] ^M's are good for DOS, bad for UNIX [FENCE] Rename bladecenter as it should be .pl -> .py [CCS] Make a bunch of functions static [BUILD] Stop using DEVEL.DATE library soname [BUILD] Set soname to 2.3 [BUILD] Move fencelib in /usr/share [BUILD] Allow users to set path to init.d [BUILD] Add --without_kernel_modules configure option [GFS] Sync with gfs2 init script [MISC] Cast some love to init scripts [CMAN] Fix path to cman_tool [INIT] Do not start services automatically [MISC] Update copyright [BUILD] Fix sparc #ifdef according to the new gcc tables [BUILD] Fix rg_test linking [BUILD] Fix install permissions Jonathan Brassow (1): ger/lvm.sh: HA LVM wasn't working on IA64 Lon Hohberger (2): [cman] Fix infinite loop in several daemons [rgmanager] Fix #441582 - symlinks in mount points causing failures Marc - A. Dahlhaus (1): [MISC] Add version string to -V options of dlm_tool and group deamons Marek 'marx' Grac (8): [FENCE] SSH support using stdin options [FENCE] Fix #435154: Support for 24 port APC fencing device [FENCE] Fix name of the option in fencing library [FENCE] Fix problem with different menu for admin/user for APC [FENCE] Fix typo in name of the exceptions in fencing agents [FENCE] Fix #248609: SSH support in Bladecenter fencing (ssh) [FENCE] Fix #446995: Parse error: Unknown option 'switch=3' [FENCE] Fix #447378 - fence_apc unable to connect via ssh to APC 7900 --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-30-g8a7314e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8a7314ea3f3d30cbf10b127fc5516a078d000adc
The branch, STABLE2 has been updated
via 8a7314ea3f3d30cbf10b127fc5516a078d000adc (commit)
via cbc0bf25dc72a03b206aa99ca76bad2061d63e52 (commit)
via 5e63f75175f340453ecd498b3a4a5c366e4e4ab2 (commit)
from 776cef92f7ca1542d63771923f4ccaeedabd613e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 8a7314ea3f3d30cbf10b127fc5516a078d000adc
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Wed May 21 09:12:31 2008 +0200
[BUILD] Fix install permissions
Virtually every distro was complaining about scripts
permissions. Clearly we were doing it wrong. Fix them all.
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
commit cbc0bf25dc72a03b206aa99ca76bad2061d63e52
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Wed May 21 09:11:58 2008 +0200
[BUILD] Fix rg_test linking
rg_test does not need libccs
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
commit 5e63f75175f340453ecd498b3a4a5c366e4e4ab2
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Tue May 20 11:00:02 2008 +0200
[BUILD] Fix sparc #ifdef according to the new gcc tables
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
---
Summary of changes:
cman/qdisk/disk_util.c |2 +-
rgmanager/include/platform.h |2 +-
rgmanager/src/clulib/vft.c |2 +-
rgmanager/src/daemons/Makefile |2 +-
rgmanager/src/resources/Makefile | 17 ++---
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index f5539c0..afa3640 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -71,7 +71,7 @@ getuptime(struct timeval *tv)
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
#else
diff --git a/rgmanager/include/platform.h b/rgmanager/include/platform.h
index 7a49cc2..8f0ac48 100644
--- a/rgmanager/include/platform.h
+++ b/rgmanager/include/platform.h
@@ -67,7 +67,7 @@ Configure is gone...
#define swab64(x) x=be_swap64(x)
-#ifdef __sparc64__
+#if defined(__sparc__)
#define ALIGNED __attribute__((aligned))
#define PACKED __attribute__((aligned,packed))
#else
diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 154bc98..6978cca 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -734,7 +734,7 @@ getuptime(struct timeval *tv)
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
&junk.tv_sec, &junk.tv_usec);
#else
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 62904f9..08959f3 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -105,7 +105,7 @@ ${TARGET2}: ${OBJS2}
# packages should run 'make check' as part of the build process.
#
${TARGET3}: ${SHAREDOBJS} ${OBJS3}
- $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+ $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) \
$(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
${TARGET4}: ${SHAREDOBJS} ${OBJS4}
diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile
index 5e5897b..5d0268d 100644
--- a/rgmanager/src/resources/Makefile
+++ b/rgmanager/src/resources/Makefile
@@ -26,9 +26,9 @@ RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh \
METADATA=apache.metadata openldap.metadata samba.metadata \
mysql.metadata postgres-8.metadata tomcat-5.metadata \
- named.metadata lvm.metadata
+ named.metadata lvm.metadata default_event_script.sl
-GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock default_event_script.sl
+GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock
UTIL_TARGETS= \
utils/ra-skelet.sh utils/messages.sh \
@@ -45,15 +45,18 @@ $(TARGET):
install: all
install -d ${sharedir}/utils
for i in $(RESOURCES); do \
-install $(S)/$$i ${sharedir}; \
+install -m755 $(S)/$$i ${sharedir}; \
done
- for i in $(GENERAL_TARGETS) $(METADATA); do \
-install -m 644 $(S)/$$i ${sharedir}; \
+ for i in $(METADATA); do \
+install -m644 $(S)/$$i ${sharedir}; \
+
Re: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-27-gd1d2954
Hi Ryan, On Wed, 28 May 2008, [EMAIL PROTECTED] wrote: - Log - commit d1d29545d7efeefbe4cd540bdd3dfd248d2310c0 Author: Ryan McCabe <[EMAIL PROTECTED]> Date: Wed May 28 16:30:42 2008 -0400 libfence: update copyright notice - Clarify copyright notice so that GPLv2 is specified explicitly. Is there any reason why it's not LGPL? I thought all our shared libraries should be LGPL to make life simpler for other people to use... - Use the full path to ssh and telnet when executing the binaries. It's generally better to avoid harcoding paths if we can avoid it. Custom builds would require extra patching if for example ssh is in /usr/local/bin.. diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 944553c..300183a 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -10,9 +10,9 @@ import telnetlib ## do not add code here. #BEGIN_VERSION_GENERATION -RELEASE_VERSION="New fence lib agent - test release on steroids" -REDHAT_COPYRIGHT="" -BUILD_DATE="March, 2008" +RELEASE_VERSION = "New fence lib agent - test release on steroids" +REDHAT_COPYRIGHT = "" +BUILD_DATE = "March, 2008" #END_VERSION_GENERATION This change is not respected by the Makefile system. Everything between #BEGIN and #END is virtually ignored. Do we need to respect this spacing? If so, i will just change the build system to do it. Thanks Fabio -- I'm going to make him an offer he can't refuse.
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-27-gd1d2954
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d1d29545d7efeefbe4cd540bdd3dfd248d2310c0
The branch, master has been updated
via d1d29545d7efeefbe4cd540bdd3dfd248d2310c0 (commit)
via 402682f083cf62426fc1878280a6fabb4be14e7d (commit)
via fdcffe0beb6d3f7558993f68f82afd388ccdcf5b (commit)
from 1413ec43636f18ceeed45d7dcfe68e8a0ec52b6c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d1d29545d7efeefbe4cd540bdd3dfd248d2310c0
Author: Ryan McCabe <[EMAIL PROTECTED]>
Date: Wed May 28 16:30:42 2008 -0400
libfence: update copyright notice
- Clarify copyright notice so that GPLv2 is specified explicitly.
commit 402682f083cf62426fc1878280a6fabb4be14e7d
Author: Ryan McCabe <[EMAIL PROTECTED]>
Date: Wed May 28 16:29:36 2008 -0400
libfence: handle EINTR correctly
- Handle EINTR correctly
- String cleanups
commit fdcffe0beb6d3f7558993f68f82afd388ccdcf5b
Author: Ryan McCabe <[EMAIL PROTECTED]>
Date: Wed May 28 16:28:34 2008 -0400
fence: fixes and cleanups to fencing.py library
- Do not report failure if a node is successfully powered off,
but fails to power on.
- Change 'pass' to 'continue' so that comments and blank lines
from stdin are ignored.
- Use the full path to ssh and telnet when executing the binaries.
---
Summary of changes:
fence/agents/lib/fencing.py.py | 37 +-
fence/libfence/agent.c | 49 ++-
fence/libfence/libfence.h |5 +--
3 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 944553c..300183a 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -10,9 +10,9 @@ import telnetlib
## do not add code here.
#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New fence lib agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
+RELEASE_VERSION = "New fence lib agent - test release on steroids"
+REDHAT_COPYRIGHT = ""
+BUILD_DATE = "March, 2008"
#END_VERSION_GENERATION
POWER_TIMEOUT = 20
@@ -29,6 +29,9 @@ EC_TIMED_OUT = 5
EC_WAITING_ON = 6
EC_WAITING_OFF = 7
+TELNET_PATH = "/usr/bin/telnet"
+SSH_PATH= "/usr/bin/ssh"
+
all_opt = {
"help": {
"getopt" : "h",
@@ -132,10 +135,10 @@ class fspawn(pexpect.spawn):
options["debug_fh"].write(self.before + self.after)
return result
-def version(command, release, build_date, copyright):
- print command, " ", release, " ", build_date;
- if len(copyright) > 0:
- print copyright
+def version(command, release, build_date, copyright_notice):
+ print command, " ", release, " ", build_date
+ if len(copyright_notice) > 0:
+ print copyright_notice
def fail_usage(message = ""):
if len(message) > 0:
@@ -174,7 +177,8 @@ def process_input(avail_opt):
##
## Set standard environment
#
- os.unsetenv("LANG")
+ os.putenv("LANG", "C")
+ os.putenv("LC_ALL", "C")
##
## Prepare list of options for getopt
@@ -184,7 +188,7 @@ def process_input(avail_opt):
if all_opt.has_key(k):
getopt_string += all_opt[k]["getopt"]
else:
- fail_usage("Parse error: unknown option '"+k+"'");
+ fail_usage("Parse error: unknown option '"+k+"'")
##
## Read options from command line or standard input
@@ -209,7 +213,8 @@ def process_input(avail_opt):
name = ""
for line in sys.stdin.readlines():
line = line.strip()
- if ((line.startswith("#")) or (len(line) == 0)): pass
+ if ((line.startswith("#")) or (len(line) == 0)):
+ continue
(name, value) = (line + "=").split("=", 1)
value = value[:-1]
@@ -302,7 +307,7 @@ def check_input(device_opt, opt):
return options
def wait_power_status(tn, options, get_power_fn):
- for x in range(POWER_TIMEOUT):
+ for dummy in xrange(POWER_TIMEOUT):
if get_power_fn(tn, options) != options["-o"]:
time.sleep(1)
else:
@@ -339,7 +344,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn):
options
[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-67-g6ccdc71
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=6ccdc714ff546423bc44954a8f581152bd212d97
The branch, RHEL4 has been updated
via 6ccdc714ff546423bc44954a8f581152bd212d97 (commit)
from 532a3cdbc09cfc0dfd85296ccc613f2753acce22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 6ccdc714ff546423bc44954a8f581152bd212d97
Author: Lon Hohberger <[EMAIL PROTECTED]>
Date: Wed May 28 10:47:37 2008 -0400
[rgmanager] Fix relocate operation when using gulm.
This fixes a regression in the relocation operation when
using gulm on the RHEL4/STABLE branches. This patch
also cleans up several log messages.
---
Summary of changes:
rgmanager/src/daemons/groups.c |4 ++--
rgmanager/src/daemons/main.c |2 +-
rgmanager/src/daemons/rg_state.c | 33 -
rgmanager/src/daemons/service_op.c |4 ++--
rgmanager/src/utils/clusvcadm.c|4 ++--
5 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c
index 5df7ed7..d1fe3db 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -753,8 +753,8 @@ eval_groups(int local, uint64_t nodeid, int nodeStatus)
pthread_rwlock_unlock(&resource_lock);
cml_free(membership);
- clulog(LOG_DEBUG, "Event (%d:%d:%d) Processed\n", local,
- (int)nodeid, nodeStatus);
+ clulog(LOG_DEBUG, "Event (%d:%llx:%d) Processed\n", local,
+ nodeid, nodeStatus);
return 0;
}
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 527c5d7..07fe206 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -153,7 +153,7 @@ membership_update(void)
new_ml = clu_member_list(RG_SERVICE_GROUP);
member_list_update(new_ml);
- clulog(LOG_DEBUG, "I am node #%lld\n", my_id());
+ clulog(LOG_DEBUG, "I am node 0x%llx\n", my_id());
/*
* Handle nodes lost. Do our local node event first.
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 4509e6a..df0ac1b 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -164,7 +164,7 @@ svc_report_failure(char *svcName)
c_name(svcName), nodeName);
} else {
clulog(LOG_ALERT, "#3: Service %s returned failure "
- "code. Last Owner: %d\n",
+ "code. Last Owner: %llx\n",
c_name(svcName), (int)svcStatus.rs_last_owner);
}
@@ -1152,7 +1152,7 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
if ((fd_relo = msg_open(target, RG_PORT, RG_PURPOSE, 2)) < 0) {
clulog(LOG_ERR,
- "#58: Failed opening connection to member #%d\n",
+ "#58: Failed opening connection to member #%llx\n",
target);
return -1;
}
@@ -1164,13 +1164,13 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
if (msg_send(fd_relo, &msg_relo, sizeof (SmMessageSt)) !=
sizeof (SmMessageSt)) {
clulog(LOG_ERR,
- "#59: Error sending remote start request to member
#%d\n",
+ "#59: Error sending remote start request to member
#%llx\n",
target);
msg_close(fd_relo);
return -1;
}
- clulog(LOG_DEBUG, "Sent remote start request to %d\n", (int)target);
+ clulog(LOG_DEBUG, "Sent remote start request to #%llx\n", target);
/* Check the response */
do {
@@ -1208,7 +1208,7 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
* In this case, we don't restart the service, because the
* service state is actually unknown to us at this time.
*/
- clulog(LOG_ERR, "#60: Mangled reply from member #%d during "
+ clulog(LOG_ERR, "#60: Mangled reply from member #%llx during "
"relocate\n", target);
msg_close(fd_relo);
return 0; /* XXX really UNKNOWN */
@@ -1249,7 +1249,7 @@ handle_relocate_req(char *svcName, int request, uint64_t
preferred_target,
{
cluster_member_list_t *allowed_nodes = NULL, *backup = NULL;
cluster_member_t *m;
- int target = preferred_target, me = my_id();
+ uint64_t target
[Cluster-devel] Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-65-g7e3ccc6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=7e3ccc62b73056a16057d5dc81b8458447007b52
The branch, RHEL47 has been updated
via 7e3ccc62b73056a16057d5dc81b8458447007b52 (commit)
from e18bde1e5732937e4c7b3e536dfea5bb183f14c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 7e3ccc62b73056a16057d5dc81b8458447007b52
Author: Lon Hohberger <[EMAIL PROTECTED]>
Date: Wed May 28 10:47:37 2008 -0400
[rgmanager] Fix relocate operation when using gulm.
This fixes a regression in the relocation operation when
using gulm on the RHEL4/STABLE branches. This patch
also cleans up several log messages.
---
Summary of changes:
rgmanager/src/daemons/groups.c |4 ++--
rgmanager/src/daemons/main.c |2 +-
rgmanager/src/daemons/rg_state.c | 33 -
rgmanager/src/daemons/service_op.c |4 ++--
rgmanager/src/utils/clusvcadm.c|4 ++--
5 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c
index 5df7ed7..d1fe3db 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -753,8 +753,8 @@ eval_groups(int local, uint64_t nodeid, int nodeStatus)
pthread_rwlock_unlock(&resource_lock);
cml_free(membership);
- clulog(LOG_DEBUG, "Event (%d:%d:%d) Processed\n", local,
- (int)nodeid, nodeStatus);
+ clulog(LOG_DEBUG, "Event (%d:%llx:%d) Processed\n", local,
+ nodeid, nodeStatus);
return 0;
}
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 527c5d7..07fe206 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -153,7 +153,7 @@ membership_update(void)
new_ml = clu_member_list(RG_SERVICE_GROUP);
member_list_update(new_ml);
- clulog(LOG_DEBUG, "I am node #%lld\n", my_id());
+ clulog(LOG_DEBUG, "I am node 0x%llx\n", my_id());
/*
* Handle nodes lost. Do our local node event first.
diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 4509e6a..df0ac1b 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -164,7 +164,7 @@ svc_report_failure(char *svcName)
c_name(svcName), nodeName);
} else {
clulog(LOG_ALERT, "#3: Service %s returned failure "
- "code. Last Owner: %d\n",
+ "code. Last Owner: %llx\n",
c_name(svcName), (int)svcStatus.rs_last_owner);
}
@@ -1152,7 +1152,7 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
if ((fd_relo = msg_open(target, RG_PORT, RG_PURPOSE, 2)) < 0) {
clulog(LOG_ERR,
- "#58: Failed opening connection to member #%d\n",
+ "#58: Failed opening connection to member #%llx\n",
target);
return -1;
}
@@ -1164,13 +1164,13 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
if (msg_send(fd_relo, &msg_relo, sizeof (SmMessageSt)) !=
sizeof (SmMessageSt)) {
clulog(LOG_ERR,
- "#59: Error sending remote start request to member
#%d\n",
+ "#59: Error sending remote start request to member
#%llx\n",
target);
msg_close(fd_relo);
return -1;
}
- clulog(LOG_DEBUG, "Sent remote start request to %d\n", (int)target);
+ clulog(LOG_DEBUG, "Sent remote start request to #%llx\n", target);
/* Check the response */
do {
@@ -1208,7 +1208,7 @@ svc_start_remote(char *svcName, int request, uint64_t
target)
* In this case, we don't restart the service, because the
* service state is actually unknown to us at this time.
*/
- clulog(LOG_ERR, "#60: Mangled reply from member #%d during "
+ clulog(LOG_ERR, "#60: Mangled reply from member #%llx during "
"relocate\n", target);
msg_close(fd_relo);
return 0; /* XXX really UNKNOWN */
@@ -1249,7 +1249,7 @@ handle_relocate_req(char *svcName, int request, uint64_t
preferred_target,
{
cluster_member_list_t *allowed_nodes = NULL, *backup = NULL;
cluster_member_t *m;
- int target = preferred_target, me = my_id();
+ uint64_t targe
Re: [Cluster-devel] [PATCH] checking NULL pointer in device_write of dlm-control
On Wed, May 28, 2008 at 02:45:10PM +0900, Masatake YAMATO wrote: > Hi, > > I found a way to let linux dereference NULL pointer > in gfs2-2.6-nmw/fs/dlm/user.c. > > If `device_write' method is called via "dlm-control", > file->private_data is NULL. (See ctl_device_open() in > user.c. ) Through proc->flags is read: > > if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && > test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags)) > return -EINVAL; Thanks for the patch, I'll push it out shortly. Dave
[Cluster-devel] [PATCH] Fix cman node name override in stable2 branch
Hi Chrissie,
the patch is fairly simple.. we fail to set the nodename when overriding
and we display wrong information in case of error.
Thanks
Fabio
--
I'm going to make him an offer he can't refuse.diff --git a/cman/daemon/cmanccs.c b/cman/daemon/cmanccs.c
index 2bfc299..78a237b 100644
--- a/cman/daemon/cmanccs.c
+++ b/cman/daemon/cmanccs.c
@@ -564,9 +564,9 @@ static int get_ccs_join_info(void)
/* our nodename */
if (nodename_env) {
int ret;
- ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME,
nodename);
+ ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME,
nodename_env);
if (ret < 0 || (size_t) ret >= sizeof(path)) {
- log_printf(LOG_ERR, "Overridden node name %s is too
long", nodename);
+ log_printf(LOG_ERR, "Overridden node name %s is too
long", nodename_env);
write_cman_pipe("Overridden node name is too long");
error = -E2BIG;
goto out;
@@ -576,11 +576,12 @@ static int get_ccs_join_info(void)
if (!error) {
free(str);
} else {
- log_printf(LOG_ERR, "Overridden node name %s is not in
CCS", nodename);
+ log_printf(LOG_ERR, "Overridden node name %s is not in
CCS", nodename_env);
write_cman_pipe("Overridden node name is not in CCS");
error = -ENOENT;
goto out;
}
+ strcpy(nodename, nodename_env);
} else {
struct utsname utsname;
