public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - groupd/fenced/dlm_controld/gfs_controld: fix lockfile
@ 2009-03-16 22:01 David Teigland
0 siblings, 0 replies; only message in thread
From: David Teigland @ 2009-03-16 22:01 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=025f1d372a768b83bb8298a5bedd3ca8016af4b7
Commit: 025f1d372a768b83bb8298a5bedd3ca8016af4b7
Parent: d4f0a9c49b2cc52ce0655a45c500b409eda32945
Author: David Teigland <teigland@redhat.com>
AuthorDate: Mon Mar 16 16:55:10 2009 -0500
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Mon Mar 16 16:55:10 2009 -0500
groupd/fenced/dlm_controld/gfs_controld: fix lockfile
These daemons were taking a lock on their lockfile before forking, but
forking clears the locks, so it needs to happen after the fork.
Signed-off-by: David Teigland <teigland@redhat.com>
---
fence/fenced/main.c | 2 +-
group/daemon/main.c | 2 +-
group/dlm_controld/main.c | 2 +-
group/gfs_controld/main.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fence/fenced/main.c b/fence/fenced/main.c
index 27db383..aaeeb07 100644
--- a/fence/fenced/main.c
+++ b/fence/fenced/main.c
@@ -1026,7 +1026,6 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&controlled_entries);
read_arguments(argc, argv);
- lockfile();
if (!daemon_debug_opt) {
if (daemon(0, 0) < 0) {
@@ -1035,6 +1034,7 @@ int main(int argc, char **argv)
}
umask(0);
}
+ lockfile();
init_logging();
log_level(LOG_INFO, "fenced %s", RELEASE_VERSION);
signal(SIGTERM, sigterm_handler);
diff --git a/group/daemon/main.c b/group/daemon/main.c
index b98b02a..461be5d 100644
--- a/group/daemon/main.c
+++ b/group/daemon/main.c
@@ -1023,7 +1023,6 @@ int main(int argc, char *argv[])
INIT_LIST_HEAD(&gd_levels[i]);
read_arguments(argc, argv);
- lockfile();
if (!daemon_debug_opt) {
if (daemon(0, 0) < 0) {
@@ -1031,6 +1030,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
}
+ lockfile();
init_logging();
log_level(LOG_INFO, "groupd %s", RELEASE_VERSION);
signal(SIGTERM, sigterm_handler);
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index 3c5c21b..ac09ae6 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -1267,7 +1267,6 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&fs_register_list);
read_arguments(argc, argv);
- lockfile();
if (!daemon_debug_opt) {
if (daemon(0, 0) < 0) {
@@ -1275,6 +1274,7 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
}
+ lockfile();
init_logging();
log_level(LOG_INFO, "dlm_controld %s", RELEASE_VERSION);
signal(SIGTERM, sigterm_handler);
diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index b15698e..be29cf2 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1516,7 +1516,6 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&withdrawn_mounts);
read_arguments(argc, argv);
- lockfile();
if (!daemon_debug_opt) {
if (daemon(0, 0) < 0) {
@@ -1524,6 +1523,7 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
}
+ lockfile();
init_logging();
log_level(LOG_INFO, "gfs_controld %s", RELEASE_VERSION);
signal(SIGTERM, sigterm_handler);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-16 22:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-16 22:01 cluster: STABLE3 - groupd/fenced/dlm_controld/gfs_controld: fix lockfile David Teigland
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 read-only IMAP folder(s) and NNTP newsgroup(s).