Cluster Project branch, master, updated. gfs-kernel_0_1_22-167-gf3dea8c
fabbione@sourceware.org
fabbione@sourceware.org
Tue Apr 15 03:44:00 GMT 2008
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=f3dea8c306d68a8ae7a136374cdebb98b97bb06c
The branch, master has been updated
via f3dea8c306d68a8ae7a136374cdebb98b97bb06c (commit)
via 70075fe6249823a33a59e5477b4c75db4e2a3e51 (commit)
via 55cb88bb22079079d44be1a7d8f729fca1698d8d (commit)
via 83c943f9024e0f790cb6e18cef8d1cf6ea321e14 (commit)
from 0ce60e8e2374789f2b0bc129f584f856dc7b604e (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 f3dea8c306d68a8ae7a136374cdebb98b97bb06c
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Tue Apr 15 05:39:30 2008 +0200
[GROUP] Fix building with standard kernels
> From: David Teigland <teigland@redhat.com>
> Subject: [Cluster-devel] kernel for building master
> This commit assumes dlm kernel changes that are only available in
> linux-next or linux-mm (linux/dlm_plock.h). This goes against our aim to
> keep master building against -rc kernels by default, so the following
> patch disables the relevant part for now. Fabio has said he may turn this
> ifdef into something more sophisticated.
Apply patch from David to allow dlm_controld to build again
against vanilla kernels.
Change the patch to use the EXPERIMENTAL_BUILD infrastructure.
Cleanup a couple of typos from the patch.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
commit 70075fe6249823a33a59e5477b4c75db4e2a3e51
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Tue Apr 15 05:33:43 2008 +0200
[BUILD] Set automatically cflags when building experimental bits
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
commit 55cb88bb22079079d44be1a7d8f729fca1698d8d
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Tue Apr 15 05:30:02 2008 +0200
[BUILD] Fix typo
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
commit 83c943f9024e0f790cb6e18cef8d1cf6ea321e14
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Tue Apr 15 05:22:46 2008 +0200
[BUILD] Add --enable_crack_of_the_day configure option
This option should NEVER be used lightly and it's there as facility
for developers that need/want to commit experimental code that,
for one reason or another, is not ready for general use or it depends
on other code that is not available mainline yet.
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
-----------------------------------------------------------------------
Summary of changes:
configure | 16 +++++++++++++++-
group/dlm_controld/main.c | 2 ++
group/dlm_controld/plock.c | 19 +++++++++++++++++++
make/defines.mk.input | 1 +
4 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 1b65c70..82268c6 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@ my %options = (
fence_agents => \$fence_agents,
fencelibdir => \$fencelibdir,
enable_experimental_fence_agents => \$enable_experimental_fence_agents,
+ enable_crack_of_the_day => \$enable_crack_of_the_day,
enable_xen => \$enable_xen,
somajor => \$somajor,
sominor => \$sominor,
@@ -155,6 +156,7 @@ my $err = &GetOptions (\%options,
'fence_agents=s',
'fencelibdir=s',
'enable_experimental_fence_agents',
+ 'enable_crack_of_the_day',
'enable_xen',
'without_ccs',
'without_cman',
@@ -230,6 +232,7 @@ if ($help || !$err) {
print "\t\tUse --fence_agents=help for a list\n";
print "--fencelibdir=\tspecify directory where to install common fence python lib. (Default: /usr/lib/fence)\n";
print "--enable_experimental_fence_agents\tEnable build and install of experimental fence agents. (Default: no)\n";
+ print "--enable_crack_of_the_day\tEnable build of highly experimental features that rely on code that is not yet available for general use. (Default: no)\n";
print "--enable_xen\tEnable building of Xen-specific pieces\n";
print "--without_ccs\tDisable ccs building (Default: enabled)\n";
print "--without_cman\tDisable cman building (Default: enabled)\n";
@@ -240,7 +243,7 @@ if ($help || !$err) {
print "--without_gfs2\tDisable gfs2 building (Default: enabled)\n";
print "--without_gnbd\tDisable gnbd building (Default: enabled)\n";
print "--without_rgmanager\tDisable rgmanager building (Default: enabled)\n";
- print "--disable_kernel_check\tDisable kernel version check (default: enabled)\n";
+ print "--disable_kernel_check\tDisable kernel version check (Default: enabled)\n";
exit $ret;
}
@@ -523,6 +526,16 @@ if (!$fencelibdir) {
if (!$enable_experimental_fence_agents) {
$enable_experimental_fence_agents="";
}
+if (!$enable_crack_of_the_day) {
+ $enable_crack_of_the_day="";
+} else {
+ print "\n********************************************************************************************\n";
+ print "WARNING: *you* have explicitly enabled all possible experimental features under development!\n";
+ print " This code will have no mercy for your data and your machines. You have been warned!\n";
+ print "\n********************************************************************************************\n";
+ $enable_experimental_fence_agents=1;
+ $cflags="${cflags} -DEXPERIMENTAL_BUILD";
+}
if (!$enable_xen) {
$enable_xen="";
}
@@ -642,6 +655,7 @@ while (<IFILE>) {
$_ =~ s/\@FENCE_AGENTS\@/$fence_agents/;
$_ =~ s/\@FENCELIBDIR\@/$fencelibdir/;
$_ =~ s/\@ENABLE_EXPERIMENTAL_FENCE_AGENTS\@/$enable_experimental_fence_agents/;
+ $_ =~ s/\@ENABLE_CRACK_OF_THE_DAY\@/$enable_crack_of_the_day/;
$_ =~ s/\@ENABLE_XEN\@/$enable_xen/;
$_ =~ s/\@DISABLE_CCS\@/$without_ccs/;
$_ =~ s/\@DISABLE_CMAN\@/$without_cman/;
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index b954f53..a3f3012 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -546,11 +546,13 @@ static int loop(void)
setup_deadlock();
}
+#ifdef EXPERIMENTAL_BUILD
rv = setup_plocks();
if (rv < 0)
goto out;
plock_fd = rv;
plock_ci = client_add(rv, process_plocks, NULL);
+#endif /* EXPERIMENTAL_BUILD */
}
for (;;) {
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 4dc38ac..5f8d4ce 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -12,6 +12,8 @@
#include "dlm_daemon.h"
#include "config.h"
+
+#ifdef EXPERIMENTAL_BUILD
#include <linux/dlm_plock.h>
#define PROC_MISC "/proc/misc"
@@ -2293,3 +2295,20 @@ int dump_plocks(char *name, int fd)
return 0;
}
+#else /* EXPERIMENTAL_BUILD */
+
+int setup_plocks(void) { return 0; };
+void process_plocks(int ci) { };
+int limit_plocks(void) { return 0; };
+void receive_plock(struct lockspace *ls, struct dlm_header *hd, int len) { };
+void receive_own(struct lockspace *ls, struct dlm_header *hd, int len) { };
+void receive_sync(struct lockspace *ls, struct dlm_header *hd, int len) { };
+void receive_drop(struct lockspace *ls, struct dlm_header *hd, int len) { };
+void process_saved_plocks(struct lockspace *ls) { };
+void close_plock_checkpoint(struct lockspace *ls) { };
+void store_plocks(struct lockspace *ls) { };
+void retrieve_plocks(struct lockspace *ls) { };
+void purge_plocks(struct lockspace *ls, int nodeid, int unmount) { };
+int dump_plocks(char *name, int fd) { return 0; };
+
+#endif /* EXPERIMENTAL_BUILD */
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 1ea77f4..acbbe36 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -68,6 +68,7 @@ virtlibdir ?= @VIRTLIBDIR@
fence_agents ?= @FENCE_AGENTS@
fencelibdir ?= @FENCELIBDIR@
enable_experimental_fence_agents ?= @ENABLE_EXPERIMENTAL_FENCE_AGENTS@
+experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
enable_xen ?= @ENABLE_XEN@
without_gnbd-kernel/src ?= @DISABLE_GNBD@
without_gfs-kernel/src/gfs ?= @DISABLE_GFS@
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list