Re: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-3-ge879971
On Mon, 2 Jun 2008, Joel Becker wrote: On Tue, Jun 03, 2008 at 05:57:35AM -, [EMAIL PROTECTED] wrote: commit e879971090c6821bb966f17875874d11aa740a5c Author: Fabio M. Di Nitto <[EMAIL PROTECTED]> Date: Tue Jun 3 07:54:37 2008 +0200 [MISC] Make several API's private again A bunch of API's have been exported and made public by mistake. libdlmcontrol, libfenced and libgfscontrol are now private again and no shared libraries are available. Um, is libdlmcontrol the method by which fs control daemons interact with dlm_controld? If so, ocfs2_controld certainly needs that shared library. As long as David is ok with it.. i was explicitly told that those libraries are for internal use only. David can we make a final call on those libs? Fabio -- I'm going to make him an offer he can't refuse.
Re: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-3-ge879971
On Tue, Jun 03, 2008 at 05:57:35AM -, [EMAIL PROTECTED] wrote: > commit e879971090c6821bb966f17875874d11aa740a5c > Author: Fabio M. Di Nitto <[EMAIL PROTECTED]> > Date: Tue Jun 3 07:54:37 2008 +0200 > > [MISC] Make several API's private again > > A bunch of API's have been exported and made public by mistake. > > libdlmcontrol, libfenced and libgfscontrol are now private again > and no shared libraries are available. Um, is libdlmcontrol the method by which fs control daemons interact with dlm_controld? If so, ocfs2_controld certainly needs that shared library. Joel -- "Ninety feet between bases is perhaps as close as man has ever come to perfection." - Red Smith Joel Becker Principal Software Developer Oracle E-mail: [EMAIL PROTECTED] Phone: (650) 506-8127
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-3-ge879971
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=e879971090c6821bb966f17875874d11aa740a5c
The branch, master has been updated
via e879971090c6821bb966f17875874d11aa740a5c (commit)
from db9e98c6e7f6cf7681a1e6b10d9029214027f8ea (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 e879971090c6821bb966f17875874d11aa740a5c
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Tue Jun 3 07:54:37 2008 +0200
[MISC] Make several API's private again
A bunch of API's have been exported and made public by mistake.
libdlmcontrol, libfenced and libgfscontrol are now private again
and no shared libraries are available.
Make sure to uninstall the shared libraries from your system
as they are not used anylonger.
NOTE: make sure to clean your tree before you git pull and
then re-configure (optional to get rid of old build variables).
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
---
Summary of changes:
configure| 42 --
dlm/libdlmcontrol/Makefile | 19 +--
dlm/tool/Makefile|7 ---
fence/fence_node/Makefile|7 ---
fence/fence_tool/Makefile|7 ---
fence/fenced/Makefile|5 ++---
fence/libfenced/Makefile | 19 +--
gfs2/mount/Makefile |6 --
group/dlm_controld/Makefile |8
group/gfs_control/Makefile |5 ++---
group/gfs_controld/Makefile |8
group/libgfscontrol/Makefile | 20 +---
make/defines.mk.input|6 --
13 files changed, 31 insertions(+), 128 deletions(-)
diff --git a/configure b/configure
index c2b648d..871639a 100755
--- a/configure
+++ b/configure
@@ -52,14 +52,8 @@ my %options = (
cmanlibdir => \$cmanlibdir,
dlmincdir => \$dlmincdir,
dlmlibdir => \$dlmlibdir,
- dlmcontrolincdir => \$dlmcontrolincdir,
- dlmcontrollibdir => \$dlmcontrollibdir,
- gfscontrolincdir => \$gfscontrolincdir,
- gfscontrollibdir => \$gfscontrollibdir,
fenceincdir => \$fenceincdir,
fencelibdir => \$fencelibdir,
- fencedincdir => \$fenceincdir,
- fencedlibdir => \$fencelibdir,
volidincdir => \$volidincdir,
volidlibdir => \$volidlibdir,
ncursesincdir => \$ncursesincdir,
@@ -133,14 +127,8 @@ my $err = &GetOptions (\%options,
'cmanlibdir=s',
'dlmincdir=s',
'dlmlibdir=s',
- 'dlmcontrolincdir=s',
- 'dlmcontrollibdir=s',
- 'gfscontrolincdir=s',
- 'gfscontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
- 'fencedincdir=s',
- 'fencedlibdir=s',
'volidincdir=s',
'volidlibdir=s',
'ncursesincdir=s',
@@ -234,14 +222,8 @@ if ($help || !$err) {
print "--cmanlibdir=\tthe base directory for cman libraries. (Default:
./cman/lib)\n";
print "--dlmincdir=\tthe base directory for dlm include files. (Default:
./dlm/libdlm)\n";
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";
- print "--fencedlibdir=\tthe base directory for fenced libraries. (Default:
./fence/libfenced)\n";
print "--volidincdir=\tthe base directory for volume_id include files.
(Default: {incdir})\n";
print "--volidlibdir=\tthe base directory for volume_id libraries.
(Default: {libdir})\n";
print "--ncursesincdir=\tthe base directory for ncurses include files.
(Default: {incdir})\n";
@@ -445,30 +427,12 @@ if (!$dlmincdir) {
if (!$dlmlibdir)
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-3-g1bbfe73
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=1bbfe738c11b227e4361374f63d2fd66507f918b
The branch, STABLE2 has been updated
via 1bbfe738c11b227e4361374f63d2fd66507f918b (commit)
from 4b5101843b2bb278a4d58e228f898402b620066a (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 1bbfe738c11b227e4361374f63d2fd66507f918b
Author: Mark Hlawatschek <[EMAIL PROTECTED]>
Date: Mon Jun 2 10:56:25 2008 -0500
mount.gfs2: skip mtab updates
Skip updates to /etc/mtab when it's a link to /proc/mounts (which is the
case for shared root gfs, for example.)
bz 318271 (RHEL5)
Signed-off-by: David Teigland <[EMAIL PROTECTED]>
---
Summary of changes:
gfs2/mount/mtab.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c
index 21b0c8c..dda5935 100644
--- a/gfs2/mount/mtab.c
+++ b/gfs2/mount/mtab.c
@@ -95,6 +95,9 @@ void add_mtab_entry(struct mount_options *mo)
read_proc_mounts(mo);
+ if (ignore_mtab())
+ return;
+
lock_mtab();
file = fopen("/etc/mtab", "a");
@@ -125,6 +128,9 @@ void del_mtab_entry(struct mount_options *mo)
struct stat sbuf;
int found = 0;
+ if (ignore_mtab())
+ return;
+
lock_mtab();
old_umask = umask(077);
hooks/post-receive
--
Cluster Project
[Cluster-devel] Re: [Ocfs2-devel] [PATCH 0/3] ocfs2: move hb_ctl into stack glue
On Fri, May 30, 2008 at 05:36:41PM -0700, Joel Becker wrote: > We have determined that ocfs2 can only leave a cluster group safely in > put_super(7). The presence of bind mounts, rbind mounts, and shared > subtrees make tracking mountpoints impossible in userspace. > > To solve this, we move the ocfs2_hb_ctl call out of o2cb and into the > generic stack glue code. ocfs2_hb_ctl will always be called for all > cluster stacks. This should be compatible with old and new tools - o2cb > behavior doesn't change. > > The code is also available on the 'hbctl-path' branch of my git > repository. > > View: > http://oss.oracle.com/git/?p=jlbec/linux-2.6.git;a=shortlog;h=hbctl-path > Pull: > git pull git://oss.oracle.com/git/jlbec/linux-2.6.git hbctl-path This is also why I've removed the gfs umount helpers from master. Dave
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-95-gd5a191a
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=d5a191ac885f866080bc6a1c8646a79df19ae624
The branch, RHEL5 has been updated
via d5a191ac885f866080bc6a1c8646a79df19ae624 (commit)
from bd01c4dadabba482a6981938bdc6ad7e61323721 (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 d5a191ac885f866080bc6a1c8646a79df19ae624
Author: Marek 'marx' Grac <[EMAIL PROTECTED]>
Date: Mon Jun 2 16:15:50 2008 +0200
[FENCE] Fix #446995: Unknown option
Previous patch worked just for command line and there was a problem with
stdin argument. Typo fixed.
---
Summary of changes:
fence/agents/lib/fencing.py.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index bb1713d..663ff43 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -107,7 +107,7 @@ all_opt = {
"help" : "-n Physical plug number on device",
"order" : 1 },
"switch" : {
- "getopt" : "-s:",
+ "getopt" : "s:",
"help" : "-s Physical switch number on device",
"order" : 1 },
"partition" : {
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-2-g4b51018
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=4b5101843b2bb278a4d58e228f898402b620066a
The branch, STABLE2 has been updated
via 4b5101843b2bb278a4d58e228f898402b620066a (commit)
from d4a28c3135cf4a06dad23c10f4228be0880bcb4a (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 4b5101843b2bb278a4d58e228f898402b620066a
Author: Marek 'marx' Grac <[EMAIL PROTECTED]>
Date: Mon Jun 2 16:15:50 2008 +0200
[FENCE] Fix #446995: Unknown option
Previous patch worked just for command line and there was a problem with
stdin argument. Typo fixed.
---
Summary of changes:
fence/agents/lib/fencing.py.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 61e5fb2..634f638 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -107,7 +107,7 @@ all_opt = {
"help" : "-n Physical plug number on device",
"order" : 1 },
"switch" : {
- "getopt" : "-s:",
+ "getopt" : "s:",
"help" : "-s Physical switch number on device",
"order" : 1 },
"test" : {
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-96-ge2862be
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=e2862bea480908959ebc2bb8c381fc3ddcf721f7
The branch, RHEL5 has been updated
via e2862bea480908959ebc2bb8c381fc3ddcf721f7 (commit)
from d5a191ac885f866080bc6a1c8646a79df19ae624 (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 e2862bea480908959ebc2bb8c381fc3ddcf721f7
Author: Mark Hlawatschek <[EMAIL PROTECTED]>
Date: Mon Jun 2 10:56:25 2008 -0500
mount.gfs2: skip mtab updates
Skip updates to /etc/mtab when it's a link to /proc/mounts (which is the
case for shared root gfs, for example.)
bz 318271 (RHEL5)
Signed-off-by: David Teigland <[EMAIL PROTECTED]>
---
Summary of changes:
gfs2/mount/mtab.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c
index 21b0c8c..dda5935 100644
--- a/gfs2/mount/mtab.c
+++ b/gfs2/mount/mtab.c
@@ -95,6 +95,9 @@ void add_mtab_entry(struct mount_options *mo)
read_proc_mounts(mo);
+ if (ignore_mtab())
+ return;
+
lock_mtab();
file = fopen("/etc/mtab", "a");
@@ -125,6 +128,9 @@ void del_mtab_entry(struct mount_options *mo)
struct stat sbuf;
int found = 0;
+ if (ignore_mtab())
+ return;
+
lock_mtab();
old_umask = umask(077);
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-2-gdb9e98c
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=db9e98c6e7f6cf7681a1e6b10d9029214027f8ea
The branch, master has been updated
via db9e98c6e7f6cf7681a1e6b10d9029214027f8ea (commit)
from 7e0b804c2e19dd929db3e432673aa14792543275 (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 db9e98c6e7f6cf7681a1e6b10d9029214027f8ea
Author: Mark Hlawatschek <[EMAIL PROTECTED]>
Date: Mon Jun 2 10:56:25 2008 -0500
mount.gfs2: skip mtab updates
Skip updates to /etc/mtab when it's a link to /proc/mounts (which is the
case for shared root gfs, for example.)
bz 318271 (RHEL5)
Signed-off-by: David Teigland <[EMAIL PROTECTED]>
---
Summary of changes:
gfs2/mount/mtab.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c
index 7df402a..fc8d6be 100644
--- a/gfs2/mount/mtab.c
+++ b/gfs2/mount/mtab.c
@@ -95,6 +95,9 @@ void add_mtab_entry(struct mount_options *mo)
read_proc_mounts(mo);
+ if (ignore_mtab())
+ return;
+
lock_mtab();
file = fopen("/etc/mtab", "a");
@@ -125,6 +128,9 @@ void del_mtab_entry(struct mount_options *mo)
struct stat sbuf;
int found = 0;
+ if (ignore_mtab())
+ return;
+
lock_mtab();
old_umask = umask(077);
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-1-g7e0b804
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=7e0b804c2e19dd929db3e432673aa14792543275
The branch, master has been updated
via 7e0b804c2e19dd929db3e432673aa14792543275 (commit)
from 50f7819a6013081bf5ffe01222004b3b693cef17 (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 7e0b804c2e19dd929db3e432673aa14792543275
Author: Marek 'marx' Grac <[EMAIL PROTECTED]>
Date: Mon Jun 2 16:15:50 2008 +0200
[FENCE] Fix #446995: Unknown option
Previous patch worked just for command line and there was a problem with
stdin argument. Typo fixed.
---
Summary of changes:
fence/agents/lib/fencing.py.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 300183a..7c88ad5 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -110,7 +110,7 @@ all_opt = {
"help" : "-n Physical plug number on device",
"order" : 1 },
"switch" : {
- "getopt" : "-s:",
+ "getopt" : "s:",
"help" : "-s Physical switch number on device",
"order" : 1 },
"partition" : {
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-68-g628c58c
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=628c58cc65ddaf23f06e5e11c61bf8f8ec28da6f
The branch, RHEL4 has been updated
via 628c58cc65ddaf23f06e5e11c61bf8f8ec28da6f (commit)
from 6ccdc714ff546423bc44954a8f581152bd212d97 (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 628c58cc65ddaf23f06e5e11c61bf8f8ec28da6f
Author: Marek 'marx' Grac <[EMAIL PROTECTED]>
Date: Mon Jun 2 16:15:50 2008 +0200
[FENCE] Fix #446995: Unknown option
Previous patch worked just for command line and there was a problem with
stdin argument. Typo fixed.
---
Summary of changes:
fence/agents/lib/fencing.py.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index bb1713d..663ff43 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -107,7 +107,7 @@ all_opt = {
"help" : "-n Physical plug number on device",
"order" : 1 },
"switch" : {
- "getopt" : "-s:",
+ "getopt" : "s:",
"help" : "-s Physical switch number on device",
"order" : 1 },
"partition" : {
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-66-gda24f0a
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=da24f0a30cb5b9950061cf1502adf263b7e3f68b
The branch, RHEL47 has been updated
via da24f0a30cb5b9950061cf1502adf263b7e3f68b (commit)
from 7e3ccc62b73056a16057d5dc81b8458447007b52 (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 da24f0a30cb5b9950061cf1502adf263b7e3f68b
Author: Marek 'marx' Grac <[EMAIL PROTECTED]>
Date: Mon Jun 2 16:15:50 2008 +0200
[FENCE] Fix #446995: Unknown option
Previous patch worked just for command line and there was a problem with
stdin argument. Typo fixed.
---
Summary of changes:
fence/agents/lib/fencing.py.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index d8b2c4e..b58d9d8 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -107,7 +107,7 @@ all_opt = {
"help" : "-n Physical plug number on device",
"order" : 1 },
"switch" : {
- "getopt" : "-s:",
+ "getopt" : "s:",
"help" : "-s Physical switch number on device",
"order" : 1 },
"test" : {
hooks/post-receive
--
Cluster Project
[Cluster-devel] conga ./clustermon.spec.in.in ./ricci.spec.in. ...
CVSROOT:/cvs/cluster
Module name:conga
Changes by: [EMAIL PROTECTED] 2008-06-02 15:14:04
Modified files:
. : clustermon.spec.in.in ricci.spec.in.in
make : version.in
ricci/modules/storage: Makefile
Log message:
Fix build for F10
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- conga/clustermon.spec.in.in 2008/05/12 15:16:04 1.43
+++ conga/clustermon.spec.in.in 2008/06/02 15:14:03 1.44
@@ -182,5 +182,5 @@
%changelog
-* Wed Feb 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-1
+* Tue May 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-3
- Initial build.
--- conga/ricci.spec.in.in 2008/03/28 01:18:51 1.9
+++ conga/ricci.spec.in.in 2008/06/02 15:14:03 1.10
@@ -126,6 +126,12 @@
exit 0
%changelog
+* Mon Jun 02 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-4
+ - No longer need -lgroup with the new cman packages.
+
+* Wed May 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-3
+ - Initial build
+
* Wed Mar 26 2008 Chris Feist <[EMAIL PROTECTED]> 0.13.0-2
- Don't require cap and xml libraries (RPM will find them)
- Fix buildroot to meet Fedora standard
--- conga/make/version.in 2008/04/28 03:56:50 1.37
+++ conga/make/version.in 2008/06/02 15:14:03 1.38
@@ -1,2 +1,2 @@
VERSION=0.13.0
-RELEASE=3
+RELEASE=4
--- conga/ricci/modules/storage/Makefile2008/01/02 20:47:37 1.16
+++ conga/ricci/modules/storage/Makefile2008/06/02 15:14:03 1.17
@@ -56,7 +56,7 @@
INCLUDE +=
CXXFLAGS += -DPARANOIA=$(PARANOID)
-LDFLAGS += -lgroup -lmagic
+LDFLAGS += -lmagic
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
[Cluster-devel] [GFS2] Revise readpage locking
>From c6f79becb5a40af012435896b88260719ee95665 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[EMAIL PROTECTED]>
Date: Mon, 2 Jun 2008 09:14:54 +0100
Subject: [PATCH] [GFS2] Revise readpage locking
The previous attempt to fix the locking in readpage failed due
to the use of a "try lock" which resulted in occasional high
cpu usage during testing (due to repeated tries) and also it
did not resolve all the ordering problems wrt the transaction
lock (although it did solve all the inode lock ordering problems).
This patch avoids the problem by unlocking the page and getting the
locks in the correct order. This means that we have to retest the
page to ensure that it hasn't changed when we relock the page.
This now passes the tests which were previously failing.
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 2b556dd..e64a1b0 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -499,31 +499,34 @@ static int __gfs2_readpage(void *file, struct page *page)
* @file: The file to read
* @page: The page of the file
*
- * This deals with the locking required. We use a trylock in order to
- * avoid the page lock / glock ordering problems returning AOP_TRUNCATED_PAGE
- * in the event that we are unable to get the lock.
+ * This deals with the locking required. We have to unlock and
+ * relock the page in order to get the locking in the right
+ * order.
*/
static int gfs2_readpage(struct file *file, struct page *page)
{
- struct gfs2_inode *ip = GFS2_I(page->mapping->host);
+ struct address_space *mapping = page->mapping;
+ struct gfs2_inode *ip = GFS2_I(mapping->host);
struct gfs2_holder gh;
int error;
- gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|LM_FLAG_TRY_1CB, &gh);
+ unlock_page(page);
+ gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
error = gfs2_glock_nq_atime(&gh);
- if (unlikely(error)) {
- unlock_page(page);
+ if (unlikely(error))
goto out;
- }
- error = __gfs2_readpage(file, page);
+ error = AOP_TRUNCATED_PAGE;
+ lock_page(page);
+ if (page->mapping == mapping && !PageUptodate(page))
+ error = __gfs2_readpage(file, page);
+ else
+ unlock_page(page);
gfs2_glock_dq(&gh);
out:
gfs2_holder_uninit(&gh);
- if (error == GLR_TRYFAILED) {
- yield();
- return AOP_TRUNCATED_PAGE;
- }
+ if (error && error != AOP_TRUNCATED_PAGE)
+ lock_page(page);
return error;
}
--
1.5.1.2
[Cluster-devel] [GFS2] Fix ordering of args for list_add
>From 9b6a76f99b73875150eaee554f1dbac5702d4e83 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[EMAIL PROTECTED]>
Date: Mon, 2 Jun 2008 09:08:47 +0100
Subject: [PATCH] [GFS2] Fix ordering of args for list_add
The patch to remove lock_nolock managed to get the arguments
of this list_add backwards. This fixes it.
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
index a4a367a..523243a 100644
--- a/fs/gfs2/locking.c
+++ b/fs/gfs2/locking.c
@@ -163,7 +163,7 @@ retry:
mutex_lock(&lmh_lock);
if (list_empty(&nolock_proto.lw_list))
- list_add(&lmh_list, &nolock_proto.lw_list);
+ list_add(&nolock_proto.lw_list, &lmh_list);
found = 0;
list_for_each_entry(lw, &lmh_list, lw_list) {
--
1.5.1.2
[Cluster-devel] [RFC] Configuring logging system for master
Hi guys, there has been a halt on porting daemons to the new logsys library because there is a small disagreement on how the configuration bits should be reflected in cluster.conf (or equivalent). It's about time to take a decision to complete this transition. The 2 current methods are: 1) as implemented by cman: 2) as originally implemented by qdisk and rgmanager (and later by ccs): The 2 philosophies behind are fairly clear: #1 consider the logging as a subsystem on its own that should be configured as standalone bit. #2 consider the logging as part of the subsystem configuration bits. All the people involved in the discussion so far (Chrissie, Lon and me) don't really have a strong opinion on which way should be taken, but a decision needs to be taken. Both ways have pro and cons... #1 Pros: it's elegant to see the configuration all in one place. Move away from subsystem keys to global ones. If the subsystem is an openais plugin, openais executive will do all the parsing for us with no code changes. Cons: the association between subystem and config is not immediate. Users need to remember mappings (CMAN == cman, CCS = ccs, etc.) that are not 1:1. There is no finegraned tuning for logging level. #2 Pros: association is immediate between config and subsystem. 3 systems already use it. Cons: it's not centralized. I personally vote for 2 (it makes more sense in my head). Please cast your vote by the end of this week. Thanks Fabio PS the subsystems that will migrate, will also retain a compat layer etc. -- I'm going to make him an offer he can't refuse.
