fence-agents: master - build: make sure fence_kdump man pages are in the release tarball
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: fdae8fe4de5b78ac32ea4577bcbe8931b1dd2740
Parent: 22ba49657526c0aacaadb5fdb6a53a8b88130531
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Aug 30 12:21:50 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Aug 30 12:21:50 2011 +0200
build: make sure fence_kdump man pages are in the release tarball
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/kdump/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/kdump/Makefile.am b/fence/agents/kdump/Makefile.am
index c8234b8..bc526c4 100644
--- a/fence/agents/kdump/Makefile.am
+++ b/fence/agents/kdump/Makefile.am
@@ -10,4 +10,4 @@ fence_kdump_CFLAGS = -D_GNU_SOURCE
fence_kdump_send_SOURCES = fence_kdump_send.c
fence_kdump_send_CFLAGS = -D_GNU_SOURCE
-man_MANS = fence_kdump.8 fence_kdump_send.8
+dist_man_MANS = fence_kdump.8 fence_kdump_send.8
12 years, 10 months
cluster: STABLE31 - cman: fix init script status return code to not overwrite global var
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: b843e89a54d9bdc9750b529f59405040b4b780db
Parent: 25ee476443cf780579d36e0c4c695dbe06acf261
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Aug 30 11:36:47 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Aug 30 11:36:47 2011 +0200
cman: fix init script status return code to not overwrite global var
Reported by Dietmar Maurer <dietmar at proxmox.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 0fcf52a..fecefea 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -46,13 +46,13 @@ failure()
status()
{
pid=$(pidof $1 2>/dev/null)
- rtrn=$?
- if [ $rtrn -ne 0 ]; then
+ statusrtrn=$?
+ if [ $statusrtrn -ne 0 ]; then
echo "$1 is stopped"
else
echo "$1 (pid $pid) is running..."
fi
- return $rtrn
+ return $statusrtrn
}
# rpm based distros
12 years, 10 months
dlm: master - dlm_controld: quiet mkdir EEXIST message
by David Teigland
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=a6e07ad5...
Commit: a6e07ad59a764effe13bd02bbc22c0e25b2e225b
Parent: 476b8ebba327d27e4610b513817aa3ebb6fbb6fd
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Aug 29 10:47:39 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Aug 29 10:51:42 2011 -0500
dlm_controld: quiet mkdir EEXIST message
EEXIST is fine, don't log an error about it
bz 732991
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/action.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index 65918aa..0570a2f 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -309,13 +309,11 @@ static int create_path(const char *path)
old_umask = umask(0022);
rv = mkdir(path, 0777);
- umask(old_umask);
-
- if (rv < 0) {
+ if (rv < 0 && errno == EEXIST)
+ rv = 0;
+ if (rv < 0)
log_error("%s: mkdir failed: %d", path, errno);
- if (errno == EEXIST)
- rv = 0;
- }
+ umask(old_umask);
return rv;
}
12 years, 10 months
cluster: STABLE31 - dlm_controld: quiet mkdir EEXIST message
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 25ee476443cf780579d36e0c4c695dbe06acf261
Parent: 04d7eb349f6c0625748a47b4749562cf945c78d0
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Aug 29 10:47:39 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Aug 29 10:50:21 2011 -0500
dlm_controld: quiet mkdir EEXIST message
EEXIST is fine, don't log an error about it
bz 732991
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/action.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index 65918aa..0570a2f 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -309,13 +309,11 @@ static int create_path(const char *path)
old_umask = umask(0022);
rv = mkdir(path, 0777);
- umask(old_umask);
-
- if (rv < 0) {
+ if (rv < 0 && errno == EEXIST)
+ rv = 0;
+ if (rv < 0)
log_error("%s: mkdir failed: %d", path, errno);
- if (errno == EEXIST)
- rv = 0;
- }
+ umask(old_umask);
return rv;
}
12 years, 10 months
cluster: RHEL6 - dlm_controld: quiet mkdir EEXIST message
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 5e5ba6d571d626412249070e4889507145deda51
Parent: 89fc6dab71b106e7d9f81bd29802ec20ee01bd5f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Aug 29 10:47:39 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Aug 29 10:47:39 2011 -0500
dlm_controld: quiet mkdir EEXIST message
EEXIST is fine, don't log an error about it
bz 732991
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/action.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index 65918aa..0570a2f 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -309,13 +309,11 @@ static int create_path(const char *path)
old_umask = umask(0022);
rv = mkdir(path, 0777);
- umask(old_umask);
-
- if (rv < 0) {
+ if (rv < 0 && errno == EEXIST)
+ rv = 0;
+ if (rv < 0)
log_error("%s: mkdir failed: %d", path, errno);
- if (errno == EEXIST)
- rv = 0;
- }
+ umask(old_umask);
return rv;
}
12 years, 10 months
cluster: RHEL6 - config: fix handling of temporary directory in ccs_update_schema
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 89fc6dab71b106e7d9f81bd29802ec20ee01bd5f
Parent: 9be180ab1ac0f7e84818ae17c7fddd1f168d22da
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Aug 29 11:09:41 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Aug 29 11:16:07 2011 +0200
config: fix handling of temporary directory in ccs_update_schema
tempdir was not set/exported and deleted correctly, leaving clutter
in /tmp
Resolves: rhbz#680930
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
config/tools/xml/ccs_update_schema.in | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/config/tools/xml/ccs_update_schema.in b/config/tools/xml/ccs_update_schema.in
index e149896..03dbb68 100644
--- a/config/tools/xml/ccs_update_schema.in
+++ b/config/tools/xml/ccs_update_schema.in
@@ -56,9 +56,15 @@ if [ "$?" != 0 ]; then
fi
check_opts $opts
+tmpdir="$(mktemp -d -q)" || {
+ echo "unable to create tempdir" >&2
+ exit 1
+}
+export tmpdir
+
# need to be careful (might have to mask traps on exit)
cleanup() {
- [ -n "$tmpdir" ] && [ -d "$tmddir" ] && rm -rf "$tmpdir"
+ [ -n "$tmpdir" ] && [ -d "$tmpdir" ] && rm -rf "$tmpdir"
rm -f $vardir/rng_update.lock
exit $1
}
@@ -342,11 +348,6 @@ install_schema() {
(
flock --exclusive 200
- tmpdir="$(mktemp -d -q)" || {
- echo "unable to create tempdir" >&2
- exit 1
- }
-
lecho "Generating resource-agents cache"
generate_ras "$tmpdir" || {
12 years, 10 months
cluster: STABLE31 - config: fix handling of temporary directory in ccs_update_schema
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 04d7eb349f6c0625748a47b4749562cf945c78d0
Parent: 151afdf127ff1ac118c13c712d49617c77640d8d
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Aug 29 11:09:41 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Aug 29 11:09:41 2011 +0200
config: fix handling of temporary directory in ccs_update_schema
tempdir was not set/exported and deleted correctly, leaving clutter
in /tmp
Resolves: rhbz#680930
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
config/tools/xml/ccs_update_schema.in | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/config/tools/xml/ccs_update_schema.in b/config/tools/xml/ccs_update_schema.in
index e149896..03dbb68 100644
--- a/config/tools/xml/ccs_update_schema.in
+++ b/config/tools/xml/ccs_update_schema.in
@@ -56,9 +56,15 @@ if [ "$?" != 0 ]; then
fi
check_opts $opts
+tmpdir="$(mktemp -d -q)" || {
+ echo "unable to create tempdir" >&2
+ exit 1
+}
+export tmpdir
+
# need to be careful (might have to mask traps on exit)
cleanup() {
- [ -n "$tmpdir" ] && [ -d "$tmddir" ] && rm -rf "$tmpdir"
+ [ -n "$tmpdir" ] && [ -d "$tmpdir" ] && rm -rf "$tmpdir"
rm -f $vardir/rng_update.lock
exit $1
}
@@ -342,11 +348,6 @@ install_schema() {
(
flock --exclusive 200
- tmpdir="$(mktemp -d -q)" || {
- echo "unable to create tempdir" >&2
- exit 1
- }
-
lecho "Generating resource-agents cache"
generate_ras "$tmpdir" || {
12 years, 10 months
cluster: STABLE31 - config: allow cman to configure uid/gid for corosync IPC
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 151afdf127ff1ac118c13c712d49617c77640d8d
Parent: cddeef5a35a6c4be8ab351079d77b953d3b6db83
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Aug 29 07:46:09 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Aug 29 07:46:09 2011 +0200
config: allow cman to configure uid/gid for corosync IPC
Resolves: rhbz#733345
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 1 +
config/tools/xml/cluster.rng.in.head | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 4b8419e..64f505f 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1532,6 +1532,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
ret = copy_tree_to_root(objdb, "amf", 0);
ret = copy_tree_to_root(objdb, "aisexec", 0);
ret = copy_tree_to_root(objdb, "service", 1);
+ ret = copy_tree_to_root(objdb, "uidgid", 0);
}
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index 7696533..1afa9e8 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -7,6 +7,7 @@ xmlns:rha="http://redhat.com/~pkennedy/annotation_namespace/cluster_conf_annot_n
cluster
- cman
- totem
+- uidgid
- quorumd
- fence_daemon
- fence_xvmd
@@ -169,6 +170,27 @@ To validate your cluster.conf against this schema, run:
</optional>
<!-- end cman block -->
+<!-- uidgid block -->
+ <optional>
+ <zeroOrMore>
+ <element name="uidgid" rha:description="Access control to corosync IPC">
+ <optional>
+ <attribute name="uid" rha:description="This is an unprivileged username,
+ as globally available to the system via /etc/passwd, including nis/ldap,
+ allowed to connect to corosync IPC. This value cannot be updated at runtime,
+ a full cman restart is required." rha:default="" rha:samble="userfoo"/>
+ </optional>
+ <optional>
+ <attribute name="gid" rha:description="This is an unprivileged group name,
+ as globally available to the system via /etc/group, including nis/ldap,
+ allowed to connect to corosync IPC. This value cannot be updated at runtime,
+ a full cman restart is required." rha:default="" rha:samble="groupfoo"/>
+ </optional>
+ </element>
+ </zeroOrMore>
+ </optional>
+<!-- end uidgid block -->
+
<!-- totem block -->
<optional>
<element name="totem" rha:description="OpenAIS msg transport
12 years, 10 months
cluster: the annotated tag cluster-3.1.6 has been created
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 56c2db3425674c9fc0679b03e2b5f2ad9219fec4
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2011-08-24 14:36 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2011-08-24 14:36 +0000
annotated tag: cluster-3.1.6 has been created
at 56c2db3425674c9fc0679b03e2b5f2ad9219fec4 (tag)
tagging cddeef5a35a6c4be8ab351079d77b953d3b6db83 (commit)
replaces cluster-3.1.5
cluster-3.1.6 release
Christine Caulfield (1):
cman: Print an error if cluster name is too long
David Teigland (1):
dlm_controld: fix plock dev_write no op
Fabio M. Di Nitto (8):
config: fix escaping of xml special characters
cman: fix printing of error if clustername is too long
cman: fix handling of transport="xxx" in cman/totem preconfig
cman: do not free shutdown connection till the last message is sent
Revert "cman: do not free shutdown connection till the last message is sent"
cman: check and set transport only when parsing primary interface
cman: make RRP mode passive the default
dlm_controld: fix build with old (< 3.0) kernel headers (take 2)
Lon Hohberger (6):
rgmanager: Create process group for children
rgmanager: Add -F to clusvcadm man page
rgmanager: Add 'disabled' configuration option
config: Add 'disabled' flag to rm element
rgmanager: Fix clusvcadm message when run with -F
rgmanager: Fix race in shutdown vs. notification
12 years, 10 months
dlm: master - dlm_controld: fix build with old (< 3.0) kernel headers (take 2)
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=476b8ebb...
Commit: 476b8ebba327d27e4610b513817aa3ebb6fbb6fd
Parent: 297eb3800e2b24b764d2bc8483d2ef72b40a0779
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Aug 24 08:35:33 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Aug 24 08:40:58 2011 +0200
dlm_controld: fix build with old (< 3.0) kernel headers (take 2)
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
group/dlm_controld/plock.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 12f35de..f8d6b02 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -3,6 +3,15 @@
#include <linux/dlm_plock.h>
+/* FIXME: remove this once everyone is using the version of
+ * dlm_plock.h which defines it */
+
+#ifndef DLM_PLOCK_FL_CLOSE
+#warning DLM_PLOCK_FL_CLOSE undefined. Enabling build workaround.
+#define DLM_PLOCK_FL_CLOSE 1
+#define DLM_PLOCK_BUILD_WORKAROUND 1
+#endif
+
static uint32_t plock_read_count;
static uint32_t plock_recv_count;
static uint32_t plock_rate_delays;
@@ -785,12 +794,7 @@ static void do_unlock(struct lockspace *ls, struct dlm_plock_info *in,
rv = unlock_internal(ls, r, in);
-/* FIXME: remove this once everyone is using the version of
- * dlm_plock.h which defines it */
-
-#ifndef DLM_PLOCK_FL_CLOSE
-#warning DLM_PLOCK_FL_CLOSE undefined. Enabling build workaround.
-#define DLM_PLOCK_FL_CLOSE 1
+#ifdef DLM_PLOCK_BUILD_WORKAROUND
if (in->pad & DLM_PLOCK_FL_CLOSE) {
#else
if (in->flags & DLM_PLOCK_FL_CLOSE) {
@@ -1641,7 +1645,11 @@ void process_plocks(int ci)
return;
fail:
+#ifdef DLM_PLOCK_BUILD_WORKAROUND
+ if (!(info.pad & DLM_PLOCK_FL_CLOSE)) {
+#else
if (!(info.flags & DLM_PLOCK_FL_CLOSE)) {
+#endif
info.rv = rv;
rv = write(plock_device_fd, &info, sizeof(info));
}
12 years, 10 months