October 2011 - cluster-commits - Fedora mailing-lists

cluster: RHEL58 - resource-agents: nfsclient: fix wildcard status checks
by Lon Hohberger 28 Oct '11

28 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=16… Commit: 169ba7b72909720363dffab9993b3f3f586e6ae6 Parent: e7e902b1029ee77f8eb5d2deb053cbb2a82e0047 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Oct 27 22:14:29 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 28 09:08:31 2011 -0400 resource-agents: nfsclient: fix wildcard status checks Several permutations of nfsclients with options were not checked correctly due to bad pattern matching. Resolves: rhbz#700103 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/resources/nfsclient.sh | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rgmanager/src/resources/nfsclient.sh b/rgmanager/src/resources/nfsclient.sh index 138370d..a68e48b 100755 --- a/rgmanager/src/resources/nfsclient.sh +++ b/rgmanager/src/resources/nfsclient.sh @@ -391,8 +391,8 @@ status|monitor) exportfs -v > $tmpfn fi - cat $tmpfn | tr -d "\n" | sed -e 's/([^)]*)/\n/g' | grep -iq \ - "^${OCF_RESKEY_path}[\t ]*.*${OCF_RESKEY_target_regexp}" + cat $tmpfn | tr -d "\n" | sed -e 's/([^)]*)/\n/g' | grep -Piq \ + "^${OCF_RESKEY_path}[\t ]+${OCF_RESKEY_target_regexp}" rv=$? if [ $rv -eq 0 ]; then @@ -400,15 +400,19 @@ status|monitor) exit 0 fi - declare OCF_RESKEY_target_tmp=$(clufindhostname -i "$OCF_RESKEY_target") + declare OCF_RESKEY_target_tmp + OCF_RESKEY_target_tmp=$(clufindhostname -i "$OCF_RESKEY_target") if [ $? -ne 0 ]; then - [ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn - ocf_log err "nfsclient:$OCF_RESKEY_name is missing!" - exit 1 + OCF_RESKEY_target_tmp=$(clufindhostname -n "$OCF_RESKEY_target") + if [ $? -ne 0 ]; then + [ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn + ocf_log err "nfsclient:$OCF_RESKEY_name is missing!" + exit 1 + fi fi - cat $tmpfn | tr -d "\n" | sed -e 's/([^)]*)/\n/g' | grep -q \ - "^${OCF_RESKEY_path}[\t ]*.*${OCF_RESKEY_target_tmp}" + cat $tmpfn | tr -d "\n" | sed -e 's/([^)]*)/\n/g' | grep -Pq \ + "^${OCF_RESKEY_path}[\t ]+${OCF_RESKEY_target_tmp}" rv=$? [ "$OCF_RESKEY_use_cache" = "1" ] || rm -f $tmpfn

1 0

cluster: RHEL58 - resource-agents: Handle TREX and Webdispatcher in SAPInstance
by Lon Hohberger 28 Oct '11

28 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e7e902b1029ee77f8eb5d2deb053cbb2a82e0047 Parent: 7768c7ef868ed0010a66af2f9e6665930ef82a41 Author: Harald Klein <hklein(a)redhat.com> AuthorDate: Thu Oct 27 19:43:17 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 28 09:04:27 2011 -0400 resource-agents: Handle TREX and Webdispatcher in SAPInstance Note: This patch is not suitable for mainline resource-agents/heartbeat/SAPInstance, alterations must be made separately. Resolves: rhbz#746992 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/resources/SAPInstance | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/SAPInstance b/rgmanager/src/resources/SAPInstance index fc0cb9e..802d3c0 100644 --- a/rgmanager/src/resources/SAPInstance +++ b/rgmanager/src/resources/SAPInstance @@ -394,7 +394,7 @@ sapinstance_monitor() { esac case $SERVICE in - disp+work|msg_server|enserver|enrepserver|jcontrol|jstart) + disp+work|msg_server|enserver|enrepserver|jcontrol|jstart|TREXDaemon.x|sapwebdisp) if [ $STATE -eq $OCF_NOT_RUNNING ] then if [ "$MONLOG" != "NOLOG" ]

1 0

cluster: RHEL58 - rgmanager: Send events on service stop & preserve frozen flag
by Lon Hohberger 28 Oct '11

28 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77… Commit: 7768c7ef868ed0010a66af2f9e6665930ef82a41 Parent: 7774de6ec56c9180eca121429207d0e82857bde5 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Oct 27 17:54:58 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 28 09:04:24 2011 -0400 rgmanager: Send events on service stop & preserve frozen flag The rgmanger FROZEN flag is supposed to persist until disabled explicitly by an administrator or loss of quorum. Resolves: rhbz#722230 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/include/event.h | 1 + rgmanager/src/daemons/groups.c | 15 +++++++++++++-- rgmanager/src/daemons/rg_state.c | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index e63dffd..4a1714f 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -137,6 +137,7 @@ int slang_process_event(event_table_t *event_table, event_t *ev); /* For distributed events. */ void set_transition_throttling(int nsecs); int get_transition_throttling(void); +void broadcast_event(char *svcName, uint32_t state, int owner, int last); /* Simplified service start. */ int service_op_start(char *svcName, int *target_list, int target_list_len, diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 77f0d05..20ed2e1 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -701,7 +701,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) resource_node_t *node; rg_state_t svcStatus; cluster_member_list_t *membership; - int ret; + int ret, state_updated = 0; if (rg_locked()) { clulog(LOG_DEBUG, @@ -718,6 +718,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) list_do(&_tree, node) { + state_updated = 0; res_build_name(svcName, sizeof(svcName), node->rn_resource); /* @@ -756,7 +757,9 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) svcStatus.rs_state = RG_STATE_STOPPED; svcStatus.rs_owner = 0; svcStatus.rs_transition = (uint64_t)time(NULL); - svcStatus.rs_flags = 0; + /* If host fails, we need to remember + * frozen flag */ + svcStatus.rs_flags &= RG_FLAG_FROZEN; if (set_rg_state(svcName, &svcStatus) != 0) { clulog(LOG_ERR, "Failed to update state" @@ -765,10 +768,18 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) rg_unlock(&lockp); continue; } + + state_updated = 1; } rg_unlock(&lockp); + if (state_updated) { + /* don't do this with lock held */ + broadcast_event(svcName, RG_STATE_STOPPED, -1, + svcStatus.rs_last_owner); + } + if (svcStatus.rs_owner == 0) nodeName = "none"; else diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index c02bfda..a8b1e36 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1549,7 +1549,8 @@ _svc_stop_finish(char *svcName, int failed, uint32_t newstate) } svcStatus.rs_state = newstate; - svcStatus.rs_flags = 0; + /* If host fails, we need to remember frozen flag */ + svcStatus.rs_flags &= RG_FLAG_FROZEN; clulog(LOG_NOTICE, "Service %s is %s\n", svcName, rg_state_str(svcStatus.rs_state));

1 0

cluster: RHEL58 - rgmanager: Mark services on dead nodes as stopped
by Lon Hohberger 28 Oct '11

28 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77… Commit: 7774de6ec56c9180eca121429207d0e82857bde5 Parent: e730f686906f480e9925621d31404c2b210abee6 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Aug 11 10:39:04 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 28 09:04:20 2011 -0400 rgmanager: Mark services on dead nodes as stopped Cleans up clustat reporting and avoids a race. Resolves: rhbz#722230 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/groups.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 1e93e03..77f0d05 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -741,6 +741,32 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) continue; } + /* Mark the service as stopped if applicable */ + if ((svcStatus.rs_owner == nodeid && !nodeStatus) && + (svcStatus.rs_state == RG_STATE_STARTED || + svcStatus.rs_state == RG_STATE_RECOVER || + svcStatus.rs_state == RG_STATE_STARTING || + svcStatus.rs_state == RG_STATE_STOPPING )) { + + clulog(LOG_DEBUG, + "Marking %s on down member %d as stopped", + svcName, nodeid); + + svcStatus.rs_last_owner = svcStatus.rs_owner; + svcStatus.rs_state = RG_STATE_STOPPED; + svcStatus.rs_owner = 0; + svcStatus.rs_transition = (uint64_t)time(NULL); + svcStatus.rs_flags = 0; + + if (set_rg_state(svcName, &svcStatus) != 0) { + clulog(LOG_ERR, "Failed to update state" + " of %s during recovery; cannot " + "fail over", svcName); + rg_unlock(&lockp); + continue; + } + } + rg_unlock(&lockp); if (svcStatus.rs_owner == 0)

1 0

cluster: STABLE31 - rgmanager: Send events on service stop & preserve frozen flag
by Lon Hohberger 27 Oct '11

27 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=70… Commit: 707e2c72c21ab0b90ad04a32cb40114dcd0cc012 Parent: 5ce78b0a1a1c5851524497b305a568e52043cf09 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Oct 27 17:54:58 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Oct 27 19:26:24 2011 -0400 rgmanager: Send events on service stop & preserve frozen flag The rgmanger FROZEN flag is supposed to persist until disabled explicitly by an administrator or loss of quorum. Resolves: rhbz#722230 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/event.h | 1 + rgmanager/src/daemons/groups.c | 15 +++++++++++++-- rgmanager/src/daemons/rg_state.c | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/rgmanager/include/event.h b/rgmanager/include/event.h index 9fc9521..1baa3a5 100644 --- a/rgmanager/include/event.h +++ b/rgmanager/include/event.h @@ -120,6 +120,7 @@ int slang_process_event(event_table_t *event_table, event_t *ev); /* For distributed events. */ void set_transition_throttling(int nsecs); int get_transition_throttling(void); +void broadcast_event(const char *svcName, uint32_t state, int owner, int last); /* Simplified service start. */ int service_op_start(char *svcName, int *target_list, int target_list_len, diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index c4929e4..78b9de9 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -683,7 +683,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) resource_node_t *node; rg_state_t svcStatus; cluster_member_list_t *membership; - int ret; + int ret, state_updated = 0; if (rg_locked()) { logt_print(LOG_DEBUG, @@ -700,6 +700,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) list_do(&_tree, node) { + state_updated = 0; res_build_name(svcName, sizeof(svcName), node->rn_resource); /* @@ -738,7 +739,9 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) svcStatus.rs_state = RG_STATE_STOPPED; svcStatus.rs_owner = 0; svcStatus.rs_transition = (uint64_t)time(NULL); - svcStatus.rs_flags = 0; + /* If host fails, we need to remember + * frozen flag */ + svcStatus.rs_flags &= RG_FLAG_FROZEN; if (set_rg_state(svcName, &svcStatus) != 0) { logt_print(LOG_ERR, "Failed to update state" @@ -747,10 +750,18 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) rg_unlock(&lockp); continue; } + + state_updated = 1; } rg_unlock(&lockp); + if (state_updated) { + /* don't do this with lock held */ + broadcast_event(svcName, RG_STATE_STOPPED, -1, + svcStatus.rs_last_owner); + } + if (svcStatus.rs_owner == 0) nodeName = (char *)"none"; else diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 0d6a0e5..8b5dcaa 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -35,7 +35,7 @@ static int handle_migrate_status(const char *svcName, int ret, rg_state_t *svcSt static int _svc_stop_finish(const char *svcName, int failed, uint32_t newstate); -static void +void broadcast_event(const char *svcName, uint32_t state, int owner, int last) { SmMessageSt msgp; @@ -1508,7 +1508,8 @@ _svc_stop_finish(const char *svcName, int failed, uint32_t newstate) } svcStatus.rs_state = newstate; - svcStatus.rs_flags = 0; + /* If host fails, we need to remember frozen flag */ + svcStatus.rs_flags &= RG_FLAG_FROZEN; logt_print(LOG_NOTICE, "Service %s is %s\n", svcName, rg_state_str(svcStatus.rs_state));

1 0

cluster: RHEL58 - fence_ipmilan: is not parsing args with passwd_script option in cluster.conf
by Marek Grác 27 Oct '11

27 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e730f686906f480e9925621d31404c2b210abee6 Parent: 9b7cfa185f63b3fd74bb6db104b3650208d19d1b Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Sep 22 10:36:37 2011 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 27 17:01:36 2011 +0200 fence_ipmilan: is not parsing args with passwd_script option in cluster.conf Resolves: rhbz#732773 --- fence/agents/ipmilan/ipmilan.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index f9d15b1..664f8a5 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -951,7 +951,6 @@ eol: for (x=0; x <= linelen; x++) { switch(line[x]) { case '\t': - case ' ': case '\r': case '\n': line[x] = 0;

1 0

cluster: RHEL58 - Bug 713295 - Do not turn cmirror init script on by default
by Jonathan Brassow 26 Oct '11

26 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9b… Commit: 9b7cfa185f63b3fd74bb6db104b3650208d19d1b Parent: 39d2c37a1abf2de9e3413fc92318ed75a6d7e5ad Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Wed Oct 26 09:12:42 2011 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Wed Oct 26 09:12:42 2011 -0500 Bug 713295 - Do not turn cmirror init script on by default --- cmirror/init.d/cmirror | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cmirror/init.d/cmirror b/cmirror/init.d/cmirror index 5f1c243..3f5e3e8 100644 --- a/cmirror/init.d/cmirror +++ b/cmirror/init.d/cmirror @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 345 22 78 +# chkconfig: - 22 78 # description: Loads/Unloads dm-log-clustered module # #

1 0

cluster: RHEL58 - rgmanager: Fix ASEHAagent to make server_name unique
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=39… Commit: 39d2c37a1abf2de9e3413fc92318ed75a6d7e5ad Parent: 5cb583fcf1293adc9df5abb01593167945dd0b0f Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Tue Oct 18 12:26:00 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 18:17:59 2011 -0400 rgmanager: Fix ASEHAagent to make server_name unique Resolves: rhbz#690265 Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/ASEHAagent.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/ASEHAagent.sh b/rgmanager/src/resources/ASEHAagent.sh index fb756d0..2b6bd69 100755 --- a/rgmanager/src/resources/ASEHAagent.sh +++ b/rgmanager/src/resources/ASEHAagent.sh @@ -119,7 +119,7 @@ meta_data() <content type="string" default="OCS-15_0" /> </parameter> - <parameter name="server_name" required="1"> + <parameter name="server_name" unique="1" required="1"> <longdesc lang="en"> The ASE server name which is configured for the HA service </longdesc>

1 0

cluster: RHEL58 - rgmanager: Fix ASEHAagent to allow for multiple ASEHA resources on one machine.
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c… Commit: 5cb583fcf1293adc9df5abb01593167945dd0b0f Parent: dd78e9fdcf6546c2c6dda88b60251d5f60d07f04 Author: Chris Feist <cfeist(a)redhat.com> AuthorDate: Mon Jun 27 15:35:32 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 18:15:53 2011 -0400 rgmanager: Fix ASEHAagent to allow for multiple ASEHA resources on one machine. Resolves: rhbz#690265 Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/ASEHAagent.sh | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/resources/ASEHAagent.sh b/rgmanager/src/resources/ASEHAagent.sh index 4c906a9..fb756d0 100755 --- a/rgmanager/src/resources/ASEHAagent.sh +++ b/rgmanager/src/resources/ASEHAagent.sh @@ -89,7 +89,7 @@ meta_data() <content type="string" /> </parameter> - <parameter name="sybase_home" unique="1" required="1"> + <parameter name="sybase_home" required="1"> <longdesc lang="en"> The home directory of sybase products </longdesc> @@ -99,7 +99,7 @@ meta_data() <content type="string" /> </parameter> - <parameter name="sybase_ase" unique="1" required="1"> + <parameter name="sybase_ase" required="1"> <longdesc lang="en"> The directory name under sybase_home where ASE products are installed </longdesc> @@ -109,7 +109,7 @@ meta_data() <content type="string" default="ASE-15_0" /> </parameter> - <parameter name="sybase_ocs" unique="1" required="1"> + <parameter name="sybase_ocs" required="1"> <longdesc lang="en"> The directory name under sybase_home where OCS products are installed, i.e. ASE-15_0 </longdesc> @@ -119,7 +119,7 @@ meta_data() <content type="string" default="OCS-15_0" /> </parameter> - <parameter name="server_name" unique="1" required="1"> + <parameter name="server_name" required="1"> <longdesc lang="en"> The ASE server name which is configured for the HA service </longdesc> @@ -129,7 +129,7 @@ meta_data() <content type="string" /> </parameter> - <parameter name="login_file" unique="1" required="1"> + <parameter name="login_file" required="1"> <longdesc lang="en"> The full path of login file which contains the login/password pair </longdesc> @@ -139,7 +139,7 @@ meta_data() <content type="string" /> </parameter> - <parameter name="interfaces_file" unique="1" required="1"> + <parameter name="interfaces_file" required="1"> <longdesc lang="en"> The full path of interfaces file which is used to start/access the ASE server </longdesc> @@ -149,7 +149,7 @@ meta_data() <content type="string" /> </parameter> - <parameter name="sybase_user" unique="1" required="1"> + <parameter name="sybase_user" required="1"> <longdesc lang="en"> The user who can run ASE server </longdesc> @@ -159,7 +159,7 @@ meta_data() <content type="string" default="sybase" /> </parameter> - <parameter name="shutdown_timeout" unique="1" required="1"> + <parameter name="shutdown_timeout" required="1"> <longdesc lang="en"> The maximum seconds to wait for the ASE server to shutdown before killing the process directly </longdesc> @@ -169,7 +169,7 @@ meta_data() <content type="integer" default="0" /> </parameter> - <parameter name="start_timeout" unique="1" required="1"> + <parameter name="start_timeout" required="1"> <longdesc lang="en"> The maximum seconds to wait for an ASE server to complete before determining that the server had failed to start </longdesc> @@ -179,7 +179,7 @@ meta_data() <content type="integer" default="0" /> </parameter> - <parameter name="deep_probe_timeout" unique="1" required="1"> + <parameter name="deep_probe_timeout" required="1"> <longdesc lang="en"> The maximum seconds to wait for the response of ASE server before determining that the server had no response while running deep probe </longdesc>

1 0

cluster: RHEL58 - rgmanager: Add -F to clusvcadm man page
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dd… Commit: dd78e9fdcf6546c2c6dda88b60251d5f60d07f04 Parent: 7106e41ced6b5d82a50cbca9e5c0e73ac99b1638 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Jul 29 13:30:38 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 18:10:16 2011 -0400 rgmanager: Add -F to clusvcadm man page Resolves: rhbz#715052 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/man/clusvcadm.8 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rgmanager/man/clusvcadm.8 b/rgmanager/man/clusvcadm.8 index d5e09eb..055a0bf 100644 --- a/rgmanager/man/clusvcadm.8 +++ b/rgmanager/man/clusvcadm.8 @@ -8,7 +8,7 @@ clusvcadm \- Cluster User Service Administration Utility .B ] .B [\-e .I <service> -.B ] +.B [\-F] ] .B [\-l] .B [\-u] .B [\-S] @@ -52,10 +52,15 @@ on which the command is invoked. Stops and disables the user service named .I service -.IP "\-e <service>" +.IP "\-e <service> [\-F]" Enables and starts the user service named .I service + +Normally, rgmanager starts the service locally (i.e. on +the host where clusvcadm was run). However, if the \fB-F\fP +option is specified, rgmanager will use the assigned failover +domain rules as hints on where to start the service. .IP \-l Lock services in preparation for cluster shutdown. This should only be used if the administrator intends to perform a global, cluster

1 0

cluster: RHEL58 - resource-agents: orainstance.sh: Fix temporary variables
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=71… Commit: 7106e41ced6b5d82a50cbca9e5c0e73ac99b1638 Parent: 5a67bbf795db62d9b20179f96b0ad17066cae4cd Author: Shane Bradley <sbradley(a)redhat.com> AuthorDate: Tue Oct 25 17:52:26 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 18:02:37 2011 -0400 resource-agents: orainstance.sh: Fix temporary variables This patch helps avoid log file name collisions when multiple instances are started or stopped at the same time. Resolves: rhbz#744283 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/orainstance.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/orainstance.sh b/rgmanager/src/resources/orainstance.sh index ca80f32..6f2ff15 100755 --- a/rgmanager/src/resources/orainstance.sh +++ b/rgmanager/src/resources/orainstance.sh @@ -81,7 +81,7 @@ start_db() { declare -i rv tmpfile=/tmp/$SCRIPT-start.$$ - logfile=/tmp/$SCRIPT-start.log + logfile=/tmp/$SCRIPT-start.log.$$ # Set up our sqlplus script. Basically, we're trying to # capture output in the hopes that it's useful in the case @@ -127,7 +127,7 @@ stop_db() { declare -i rv tmpfile=/tmp/$SCRIPT-stop.$$ - logfile=/tmp/$SCRIPT-stop.log + logfile=/tmp/$SCRIPT-stop.log.$$ ora_procname="ora_${DB_PROCNAMES}_${ORACLE_SID}" status $ora_procname

1 0

cluster: RHEL58 - rgmanager: Fix dependency restart bug in CP mode
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5a… Commit: 5a67bbf795db62d9b20179f96b0ad17066cae4cd Parent: 98c9f869ffb041341b835d19da3845b6165af7d2 Author: Adam Drew <adrew(a)redhat.com> AuthorDate: Fri Oct 7 12:31:16 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 18:02:33 2011 -0400 rgmanager: Fix dependency restart bug in CP mode If we: - had central_processing mode enabled, - had a service with 'depend' set on another service, - we attempted to restart the service with the dependency, and - the dependency was missing rgmanager would leave the state in 'recovering' This is the corrected patch from Adam. Resolves: rhbz#743442 Signed-off-by: Adam Drew <adrew(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index d567465..cdde066 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -158,6 +158,7 @@ define move_or_start(service, node_list) (,,, owner, state) = service_status(depends); if (owner < 0) { debug(service, " is not runnable; dependency not met"); + ()=service_stop(service); return ERR_DEPEND; } }

1 0

cluster: RHEL58 - rgmanager: Fix dependency restart bug
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=98… Commit: 98c9f869ffb041341b835d19da3845b6165af7d2 Parent: 886d6504464e4af32d02da0d64fd09a040b65fe4 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Oct 7 12:31:16 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 17:47:44 2011 -0400 rgmanager: Fix dependency restart bug If we: - had a service with 'depend' set on another service, - both services were running on the same host, - that host died, and - the service which depended on the other service also had the 'restart' recovery policy, rgmanager would enter handle_start_req and return an immediate error - with no further recovery action performed. Resolves: rhbz#743442 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index dce28db..c02bfda 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2131,8 +2131,16 @@ handle_start_req(char *svcName, int req, int *new_owner) /* Check for dependency. We cannot start unless our dependency is met */ - if (check_depend_safe(svcName) == 0) + if (check_depend_safe(svcName) == 0) { + if (req == RG_START_RECOVER) { + clulog(LOG_INFO, "Dependency for %s missing " + "during recovery; marking as stopped", + svcName); + + _svc_stop_finish(svcName, 0, RG_STATE_STOPPED); + } return RG_EDEPEND; + } /* * This is a 'root' start request. We need to clear out our failure

1 0

cluster: RHEL58 - rgmanager: Resolve rare deadlock
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=88… Commit: 886d6504464e4af32d02da0d64fd09a040b65fe4 Parent: 141d1d9241b2ad2cd8865d524a6b38dc069fffd3 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Sep 6 15:42:41 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 17:47:02 2011 -0400 rgmanager: Resolve rare deadlock In very rare cases, it was possible to fill up a pipe used for IPC between threads during reconfiguration, causing a deadlock. This patch resolves the issue. Resolves: rhbz#713243 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/groups.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index b546421..1e93e03 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -1737,8 +1737,6 @@ init_resource_groups(int reconfigure, int do_init, int new_config_version) free(val); } - /* Wait for any pending requests */ - rg_wait_threads(); /* Block operations that would break during configuration changes */ rg_clear_initialized(FL_CONFIG);

1 0

cluster: STABLE31 - rgmanager: Fix dependency restart bug in CP mode
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c… Commit: 5ce78b0a1a1c5851524497b305a568e52043cf09 Parent: a95fcca7ecd070c0fef1b85d3158e728b04c3398 Author: Adam Drew <adrew(a)redhat.com> AuthorDate: Fri Oct 7 12:31:16 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 17:31:15 2011 -0400 rgmanager: Fix dependency restart bug in CP mode If we: - had central_processing mode enabled, - had a service with 'depend' set on another service, - we attempted to restart the service with the dependency, and - the dependency was missing rgmanager would leave the state in 'recovering' This is the corrected patch from Adam. Resolves: rhbz#743442 Signed-off-by: Adam Drew <adrew(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index 759215c..4c5ca0e 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -178,6 +178,7 @@ define move_or_start(service, node_list) (,,, owner, state) = service_status(depends); if (owner < 0) { debug(service, " is not runnable; dependency not met"); + ()=service_stop(service); return ERR_DEPEND; } }

1 0

cluster: STABLE31 - Revert "rgmanager: Fix dependency restart bug in CP mode"
by Lon Hohberger 25 Oct '11

25 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a9… Commit: a95fcca7ecd070c0fef1b85d3158e728b04c3398 Parent: ff5a198a0712fa91efdc0912c3db5ae30a87f7f8 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 25 17:27:00 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 25 17:27:00 2011 -0400 Revert "rgmanager: Fix dependency restart bug in CP mode" This reverts commit c751d1894640b096808d2f13e331bee4c536f96a. This patch was not the one intended to be pushed. --- rgmanager/src/resources/default_event_script.sl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index 57f65e9..759215c 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -178,9 +178,6 @@ define move_or_start(service, node_list) (,,, owner, state) = service_status(depends); if (owner < 0) { debug(service, " is not runnable; dependency not met"); - if (state == "recovering") { - service_stop(service); - } return ERR_DEPEND; } }

1 0

cluster: RHEL6 - rgmanager: Block signals when dealing with dbus
by Lon Hohberger 19 Oct '11

19 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=17… Commit: 17bacf59aea4f2d021ba8127f71e9d840703b692 Parent: a8cca57d6dd0026ac49c87b0dd9e9906cc7872cb Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 18 19:05:59 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Oct 19 09:06:11 2011 -0400 rgmanager: Block signals when dealing with dbus DBus calls seem to not retry in the event of signals; it appears that occasionally this causes a double unref or a segfault. So, block signals when dealing with DBus in order to prevent rgmanager from crashing. Resolves: rhbz#741607 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-By: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 62 +++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 13 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index 29ecaca..e706746 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -12,6 +12,7 @@ #include <dbus/dbus.h> #include <liblogthread.h> #include <members.h> +#include <signal.h> #define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" @@ -28,6 +29,28 @@ static pthread_t th = 0; /* Set this to the desired value prior to calling rgm_dbus_init() */ int rgm_dbus_notify = RGM_DBUS_DEFAULT; +/* + * block the world when entering dbus critical sections so that + * if we get a signal while in dbus critical (exclusive of crash + * signals), we ignore it + */ +#define DBUS_ENTRY(set, old) \ +do { \ + pthread_mutex_lock(&mu); \ + sigfillset(&set); \ + sigdelset(&set, SIGILL); \ + sigdelset(&set, SIGSEGV); \ + sigdelset(&set, SIGABRT); \ + sigdelset(&set, SIGBUS); \ + sigprocmask(SIG_SETMASK, &set, &old); \ +} while(0) + +#define DBUS_EXIT(old) \ +do { \ + sigprocmask(SIG_SETMASK, &old, NULL); \ + pthread_mutex_unlock(&mu); \ +} while(0) + int rgm_dbus_init(void) @@ -35,13 +58,14 @@ rgm_dbus_init(void) { DBusConnection *dbc = NULL; DBusError err; + sigset_t set, old; if (!rgm_dbus_notify) return 0; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (db) { - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return 0; } @@ -53,7 +77,7 @@ rgm_dbus_init(void) "DBus Failed to initialize: dbus_bus_get: %s\n", err.message); dbus_error_free(&err); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return -1; } @@ -63,7 +87,7 @@ rgm_dbus_init(void) pthread_create(&th, NULL, _dbus_auto_flush, NULL); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; } @@ -111,10 +135,11 @@ rgm_dbus_release(void) #ifdef DBUS { int ret; + sigset_t set, old; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); ret = _rgm_dbus_release(); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return ret; } #else @@ -131,6 +156,15 @@ rgm_dbus_release(void) static void * _dbus_auto_flush(void *arg) { + sigset_t set; + + sigfillset(&set); + sigdelset(&set, SIGILL); + sigdelset(&set, SIGSEGV); + sigdelset(&set, SIGABRT); + sigdelset(&set, SIGBUS); + sigprocmask(SIG_SETMASK, &set, NULL); + /* DBus connection functions are thread safe */ while (dbus_connection_read_write(db, 500)) { if (!th) @@ -151,8 +185,9 @@ _rgm_dbus_notify(const char *svcname, { DBusMessage *msg = NULL; int ret = 0; + sigset_t set, old; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (!db) { goto out_unlock; @@ -197,10 +232,10 @@ _rgm_dbus_notify(const char *svcname, ret = 0; out_unlock: - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); if (msg) dbus_message_unref(msg); -out_free: + return ret; } @@ -216,6 +251,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) cluster_member_list_t *m = NULL; const char *owner; const char *last; + sigset_t set, old; int ret = 0; if (!rgm_dbus_notify) @@ -225,18 +261,18 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (size != (sizeof(*st))) goto out_free; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (!db) { - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); goto out_free; } if (!th) { /* Dispatch thread died. */ _rgm_dbus_release(); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); goto out_free; } - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); st = (rg_state_t *)data; swab_rg_state_t(st);

1 0

cluster: RHEL6 - rgmanager: Clean up DBus concurrency
by Lon Hohberger 19 Oct '11

19 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a8… Commit: a8cca57d6dd0026ac49c87b0dd9e9906cc7872cb Parent: 0fac6d9e86424411289bf7926bc6f8c6805082e9 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 28 10:56:54 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Oct 19 09:05:42 2011 -0400 rgmanager: Clean up DBus concurrency This centralizes creation/deletion of the DBus dispatch thread. Resolves: rhbz#741607 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-By: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index b45113c..29ecaca 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -18,6 +18,8 @@ #define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" #define DBUS_RGM_PATH "/com/redhat/cluster/rgmanager" +static void * _dbus_auto_flush(void *arg); + static DBusConnection *db = NULL; static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; @@ -58,6 +60,9 @@ rgm_dbus_init(void) dbus_connection_set_exit_on_disconnect(dbc, FALSE); db = dbc; + + pthread_create(&th, NULL, _dbus_auto_flush, NULL); + pthread_mutex_unlock(&mu); logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; @@ -169,8 +174,7 @@ _rgm_dbus_notify(const char *svcname, } if (!th) { - /* start auto-flush thread if needed */ - pthread_create(&th, NULL, _dbus_auto_flush, NULL); + goto out_unlock; } if (!(msg = dbus_message_new_signal(DBUS_RGM_PATH, @@ -226,6 +230,12 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) pthread_mutex_unlock(&mu); goto out_free; } + if (!th) { + /* Dispatch thread died. */ + _rgm_dbus_release(); + pthread_mutex_unlock(&mu); + goto out_free; + } pthread_mutex_unlock(&mu); st = (rg_state_t *)data;

1 0

cluster: STABLE31 - rgmanager: Block signals when dealing with dbus
by Lon Hohberger 18 Oct '11

18 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ff… Commit: ff5a198a0712fa91efdc0912c3db5ae30a87f7f8 Parent: 4ab2a3a55eb164a65f361b7d9bbbf186e88cf247 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 18 19:05:59 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 18 23:24:58 2011 -0400 rgmanager: Block signals when dealing with dbus DBus calls seem to not retry in the event of signals; it appears that occasionally this causes a double unref or a segfault. So, block signals when dealing with DBus in order to prevent rgmanager from crashing. Resolves: rhbz#741607 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 62 +++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 13 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index 29ecaca..e706746 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -12,6 +12,7 @@ #include <dbus/dbus.h> #include <liblogthread.h> #include <members.h> +#include <signal.h> #define DBUS_RGM_NAME "com.redhat.cluster.rgmanager" @@ -28,6 +29,28 @@ static pthread_t th = 0; /* Set this to the desired value prior to calling rgm_dbus_init() */ int rgm_dbus_notify = RGM_DBUS_DEFAULT; +/* + * block the world when entering dbus critical sections so that + * if we get a signal while in dbus critical (exclusive of crash + * signals), we ignore it + */ +#define DBUS_ENTRY(set, old) \ +do { \ + pthread_mutex_lock(&mu); \ + sigfillset(&set); \ + sigdelset(&set, SIGILL); \ + sigdelset(&set, SIGSEGV); \ + sigdelset(&set, SIGABRT); \ + sigdelset(&set, SIGBUS); \ + sigprocmask(SIG_SETMASK, &set, &old); \ +} while(0) + +#define DBUS_EXIT(old) \ +do { \ + sigprocmask(SIG_SETMASK, &old, NULL); \ + pthread_mutex_unlock(&mu); \ +} while(0) + int rgm_dbus_init(void) @@ -35,13 +58,14 @@ rgm_dbus_init(void) { DBusConnection *dbc = NULL; DBusError err; + sigset_t set, old; if (!rgm_dbus_notify) return 0; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (db) { - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return 0; } @@ -53,7 +77,7 @@ rgm_dbus_init(void) "DBus Failed to initialize: dbus_bus_get: %s\n", err.message); dbus_error_free(&err); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return -1; } @@ -63,7 +87,7 @@ rgm_dbus_init(void) pthread_create(&th, NULL, _dbus_auto_flush, NULL); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; } @@ -111,10 +135,11 @@ rgm_dbus_release(void) #ifdef DBUS { int ret; + sigset_t set, old; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); ret = _rgm_dbus_release(); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); return ret; } #else @@ -131,6 +156,15 @@ rgm_dbus_release(void) static void * _dbus_auto_flush(void *arg) { + sigset_t set; + + sigfillset(&set); + sigdelset(&set, SIGILL); + sigdelset(&set, SIGSEGV); + sigdelset(&set, SIGABRT); + sigdelset(&set, SIGBUS); + sigprocmask(SIG_SETMASK, &set, NULL); + /* DBus connection functions are thread safe */ while (dbus_connection_read_write(db, 500)) { if (!th) @@ -151,8 +185,9 @@ _rgm_dbus_notify(const char *svcname, { DBusMessage *msg = NULL; int ret = 0; + sigset_t set, old; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (!db) { goto out_unlock; @@ -197,10 +232,10 @@ _rgm_dbus_notify(const char *svcname, ret = 0; out_unlock: - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); if (msg) dbus_message_unref(msg); -out_free: + return ret; } @@ -216,6 +251,7 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) cluster_member_list_t *m = NULL; const char *owner; const char *last; + sigset_t set, old; int ret = 0; if (!rgm_dbus_notify) @@ -225,18 +261,18 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) if (size != (sizeof(*st))) goto out_free; - pthread_mutex_lock(&mu); + DBUS_ENTRY(set, old); if (!db) { - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); goto out_free; } if (!th) { /* Dispatch thread died. */ _rgm_dbus_release(); - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); goto out_free; } - pthread_mutex_unlock(&mu); + DBUS_EXIT(old); st = (rg_state_t *)data; swab_rg_state_t(st);

1 0

cluster: STABLE31 - rgmanager: Clean up DBus concurrency
by Lon Hohberger 18 Oct '11

18 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4a… Commit: 4ab2a3a55eb164a65f361b7d9bbbf186e88cf247 Parent: c751d1894640b096808d2f13e331bee4c536f96a Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Sep 28 10:56:54 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 18 23:24:47 2011 -0400 rgmanager: Clean up DBus concurrency This centralizes creation/deletion of the DBus dispatch thread. Resolves: rhbz#741607 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index b45113c..29ecaca 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -18,6 +18,8 @@ #define DBUS_RGM_IFACE "com.redhat.cluster.rgmanager" #define DBUS_RGM_PATH "/com/redhat/cluster/rgmanager" +static void * _dbus_auto_flush(void *arg); + static DBusConnection *db = NULL; static pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER; static pthread_t th = 0; @@ -58,6 +60,9 @@ rgm_dbus_init(void) dbus_connection_set_exit_on_disconnect(dbc, FALSE); db = dbc; + + pthread_create(&th, NULL, _dbus_auto_flush, NULL); + pthread_mutex_unlock(&mu); logt_print(LOG_DEBUG, "DBus Notifications Initialized\n"); return 0; @@ -169,8 +174,7 @@ _rgm_dbus_notify(const char *svcname, } if (!th) { - /* start auto-flush thread if needed */ - pthread_create(&th, NULL, _dbus_auto_flush, NULL); + goto out_unlock; } if (!(msg = dbus_message_new_signal(DBUS_RGM_PATH, @@ -226,6 +230,12 @@ rgm_dbus_update(char *key, uint64_t view, void *data, uint32_t size) pthread_mutex_unlock(&mu); goto out_free; } + if (!th) { + /* Dispatch thread died. */ + _rgm_dbus_release(); + pthread_mutex_unlock(&mu); + goto out_free; + } pthread_mutex_unlock(&mu); st = (rg_state_t *)data;

1 0

cluster: STABLE31 - rgmanager: Fix dependency restart bug in CP mode
by Lon Hohberger 18 Oct '11

18 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c7… Commit: c751d1894640b096808d2f13e331bee4c536f96a Parent: 90373b84a47814c38ba030509882bc8cca3fe458 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Oct 7 12:31:16 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Oct 13 16:15:57 2011 -0400 rgmanager: Fix dependency restart bug in CP mode If we: - had central_processing mode enabled, - had a service with 'depend' set on another service, - we attempted to restart the service with the dependency, and - the dependency was missing rgmanager would leave the state in 'recovering' Resolves: rhbz#743442 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index 759215c..57f65e9 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -178,6 +178,9 @@ define move_or_start(service, node_list) (,,, owner, state) = service_status(depends); if (owner < 0) { debug(service, " is not runnable; dependency not met"); + if (state == "recovering") { + service_stop(service); + } return ERR_DEPEND; } }

1 0

cluster: RHEL58 - cman: fix building of debuginfo package (enable -g)
by Fabio M. Di Nitto 17 Oct '11

17 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=14… Commit: 141d1d9241b2ad2cd8865d524a6b38dc069fffd3 Parent: f38483b5b484828f78d04e6188f9e10c3b1c6892 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Oct 17 10:39:57 2011 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Oct 17 10:39:57 2011 +0200 cman: fix building of debuginfo package (enable -g) Resolves: rhbz#746599 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/daemon/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile index 3e6f1f7..de233b0 100644 --- a/cman/daemon/Makefile +++ b/cman/daemon/Makefile @@ -21,7 +21,7 @@ CFLAGS+= -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \ ifeq ($(DEBUG),y) CFLAGS+= -O0 -g -DDEBUG else -CFLAGS+= -O2 +CFLAGS+= -O2 -g endif TARGET=service_cman.lcrso

1 0

cluster: RHEL58 - qdisk: Fix man page example
by Fabio M. Di Nitto 17 Oct '11

17 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f3… Commit: f38483b5b484828f78d04e6188f9e10c3b1c6892 Parent: 8034c6d0c7f68e6e8d823d65edda986b4a4f510b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Oct 12 11:23:28 2011 -0400 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Oct 17 10:21:59 2011 +0200 qdisk: Fix man page example Resolves: rhbz#745536 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/man/qdisk.5 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5 index 100952e..eccef6c 100644 --- a/cman/man/qdisk.5 +++ b/cman/man/qdisk.5 @@ -1,6 +1,6 @@ -.TH "QDisk" "5" "06 Sep 2007" "" "Cluster Quorum Disk" +.TH "QDisk" "5" "12 Oct 2011" "" "Cluster Quorum Disk" .SH "NAME" -QDisk 1.2.1 \- a disk-based quorum daemon for CMAN / Linux-Cluster +qdisk \- a disk-based quorum daemon for CMAN / Linux-Cluster .SH "1. Overview" .SH "1.1 Problem" In some situations, it may be necessary or desirable to sustain @@ -463,7 +463,7 @@ by the qdiskd timeout. .br <quorumd interval="1" tko="10" votes="1" label="testing"> .in 12 -<heuristic program="ping A -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping A -c1 -w1" score="1" interval="2" tko="3"/> .br .in 8 </quorumd>

1 0

cluster: RHEL58 - cman: Clean shutdown_con if the controlling process is killed.
by Fabio M. Di Nitto 17 Oct '11

17 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=80… Commit: 8034c6d0c7f68e6e8d823d65edda986b4a4f510b Parent: 523abe7c546805181ea3969b61d01aa23402335e Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Fri Sep 19 13:02:40 2008 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Mon Oct 17 10:09:53 2011 +0200 cman: Clean shutdown_con if the controlling process is killed. If a shutdown is initiated by a process that is then killed, the shutdown_con isn't cleared. So if another process replies to the shutdown request cman could segfault. Resolves: rhbz#590101 Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> Signed-off-by: Fabio M. Di Nitto <fdintto(a)redhat.com> --- cman/daemon/commands.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index ddc85ec..1fafdac 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -1541,6 +1541,11 @@ void unbind_con(struct connection *con) check_shutdown_status(); } + + /* If the controlling shutdown process has quit, then cancel the + shutdown session */ + if (con == shutdown_con) + shutdown_con = NULL; } /* Post a PORT OPEN/CLOSE event to anyone listening on this end */

1 0

cluster: STABLE31 - qdisk: Fix man page example
by Lon Hohberger 12 Oct '11

12 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=90… Commit: 90373b84a47814c38ba030509882bc8cca3fe458 Parent: c2697a0eae26d6542edbaaf72efdeb4cbf6e476f Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Oct 12 11:23:28 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Wed Oct 12 11:24:55 2011 -0400 qdisk: Fix man page example Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/man/qdisk.5 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5 index 4070f48..e0b0ff6 100644 --- a/cman/man/qdisk.5 +++ b/cman/man/qdisk.5 @@ -1,4 +1,4 @@ -.TH "QDisk" "5" "20 Feb 2007" "" "Cluster Quorum Disk" +.TH "QDisk" "5" "12 Oct 2011" "" "Cluster Quorum Disk" .SH "NAME" qdisk \- a disk-based quorum daemon for CMAN / Linux-Cluster .SH "1. Overview" @@ -502,7 +502,7 @@ by the qdiskd timeout. .br <quorumd interval="1" tko="10" votes="1" label="testing"> .in 12 -<heuristic program="ping A -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping A -c1 -w1" score="1" interval="2" tko="3"/> .br .in 8 </quorumd>

1 0

cluster: STABLE31 - rgmanager: Fix dependency restart bug
by Lon Hohberger 11 Oct '11

11 Oct '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c2… Commit: c2697a0eae26d6542edbaaf72efdeb4cbf6e476f Parent: afe8df67ab28a9fed6ba01a4a952354a012d9b25 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Oct 7 12:31:16 2011 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 11 18:59:57 2011 -0400 rgmanager: Fix dependency restart bug If we: - had a service with 'depend' set on another service, - both services were running on the same host, - that host died, and - the service which depended on the other service also had the 'restart' recovery policy, rgmanager would enter handle_start_req and return an immediate error - with no further recovery action performed. Resolves: rhbz#743442 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 3db6bd9..0d6a0e5 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2075,8 +2075,16 @@ handle_start_req(char *svcName, int req, int *new_owner) /* Check for dependency. We cannot start unless our dependency is met */ - if (check_depend_safe(svcName) == 0) + if (check_depend_safe(svcName) == 0) { + if (req == RG_START_RECOVER) { + logt_print(LOG_INFO, "Dependency for %s missing " + "during recovery; marking as stopped", + svcName); + + _svc_stop_finish(svcName, 0, RG_STATE_STOPPED); + } return RG_EDEPEND; + } /* * This is a 'root' start request. We need to clear out our failure

1 0

dlm: master - dlm_controld: rename member_cman.c
by David Teigland 11 Oct '11

11 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=ca4807a270… Commit: ca4807a270a126ac6ee4d58f9c6c0658053b4101 Parent: 6011133ecf9899148970d979c0c1d930c6cfe474 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Oct 11 13:59:09 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Oct 11 13:59:43 2011 -0500 dlm_controld: rename member_cman.c Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/Makefile | 2 +- dlm_controld/dlm_daemon.h | 2 +- dlm_controld/member.c | 311 ++++++++++++++++++++++++++++++++++++++++++++ dlm_controld/member_cman.c | 311 -------------------------------------------- 4 files changed, 313 insertions(+), 313 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index a4cc5d7..403cc91 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -29,7 +29,7 @@ BIN_SOURCE = action.c \ main.c \ plock.c \ config.c \ - member_cman.c \ + member.c \ logging.c \ rbtree.c LIB_SOURCE = lib.c diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 9d8cd52..b999267 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -330,7 +330,7 @@ struct lockspace *find_ls_id(uint32_t id); const char *dlm_mode_str(int mode); void cluster_dead(int ci); -/* member_cman.c */ +/* member.c */ int setup_cluster(void); void close_cluster(void); void process_cluster(int ci); diff --git a/dlm_controld/member.c b/dlm_controld/member.c new file mode 100644 index 0000000..d645911 --- /dev/null +++ b/dlm_controld/member.c @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + +#include "dlm_daemon.h" +#include <corosync/corotypes.h> +#include <corosync/cfg.h> +#include <corosync/quorum.h> + +static corosync_cfg_handle_t ch; +static quorum_handle_t qh; +static uint32_t old_nodes[MAX_NODES]; +static int old_node_count; +static uint32_t quorum_nodes[MAX_NODES]; +static int quorum_node_count; +static struct list_head cluster_nodes; + +struct node_cluster { + struct list_head list; + int nodeid; + + uint64_t cluster_add_time; + uint64_t cluster_rem_time; +}; + +static struct node_cluster *get_cluster_node(int nodeid, int create) +{ + struct node_cluster *node; + + list_for_each_entry(node, &cluster_nodes, list) { + if (node->nodeid == nodeid) + return node; + } + + if (!create) + return NULL; + + node = malloc(sizeof(struct node_cluster)); + if (!node) + return NULL; + + memset(node, 0, sizeof(struct node_cluster)); + node->nodeid = nodeid; + list_add(&node->list, &cluster_nodes); + return node; +} + +static void add_cluster_node(int nodeid, uint64_t now) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 1); + if (!node) + return; + node->cluster_add_time = now; +} + +static void rem_cluster_node(int nodeid, uint64_t now) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 0); + if (!node) + return; + node->cluster_rem_time = now; +} + +uint64_t cluster_add_time(int nodeid) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 0); + if (!node) + return 0; + + return node->cluster_add_time; +} + +static int is_member(uint32_t *node_list, int count, uint32_t nodeid) +{ + int i; + + for (i = 0; i < count; i++) { + if (node_list[i] == nodeid) + return 1; + } + return 0; +} + +static int is_old_member(uint32_t nodeid) +{ + return is_member(old_nodes, old_node_count, nodeid); +} + +int is_cluster_member(uint32_t nodeid) +{ + return is_member(quorum_nodes, quorum_node_count, nodeid); +} + +static void quorum_callback(quorum_handle_t h, uint32_t quorate, + uint64_t ring_seq, uint32_t node_list_entries, + uint32_t *node_list) +{ + corosync_cfg_node_address_t addrs[MAX_NODE_ADDRESSES]; + corosync_cfg_node_address_t *addrptr = addrs; + cs_error_t err; + int i, j, num_addrs; + uint64_t now = monotime(); + + if (!cluster_quorate && quorate) + quorate_time = now; + + cluster_quorate = quorate; + cluster_ringid_seq = (uint32_t)ring_seq; + + log_debug("cluster quorum %u seq %u nodes %u", + cluster_quorate, cluster_ringid_seq, node_list_entries); + + old_node_count = quorum_node_count; + memcpy(&old_nodes, &quorum_nodes, sizeof(old_nodes)); + + quorum_node_count = 0; + memset(&quorum_nodes, 0, sizeof(quorum_nodes)); + + for (i = 0; i < node_list_entries; i++) + quorum_nodes[quorum_node_count++] = node_list[i]; + + for (i = 0; i < old_node_count; i++) { + if (!is_cluster_member(old_nodes[i])) { + log_debug("cluster node %u removed seq %u", + old_nodes[i], cluster_ringid_seq); + rem_cluster_node(old_nodes[i], now); + del_configfs_node(old_nodes[i]); + } + } + + for (i = 0; i < quorum_node_count; i++) { + if (!is_old_member(quorum_nodes[i])) { + log_debug("cluster node %u added seq %u", + quorum_nodes[i], cluster_ringid_seq); + add_cluster_node(quorum_nodes[i], now); + + err = corosync_cfg_get_node_addrs(ch, quorum_nodes[i], + MAX_NODE_ADDRESSES, + &num_addrs, addrs); + if (err != CS_OK) { + log_error("corosync_cfg_get_node_addrs failed " + "nodeid %u", quorum_nodes[i]); + continue; + } + + for (j = 0; j < num_addrs; j++) { + add_configfs_node(quorum_nodes[i], + addrptr[j].address, + addrptr[j].address_length, + (quorum_nodes[i] == + our_nodeid)); + } + } + } +} + +static quorum_callbacks_t quorum_callbacks = +{ + .quorum_notify_fn = quorum_callback, +}; + +void process_cluster(int ci) +{ + cs_error_t err; + + err = quorum_dispatch(qh, CS_DISPATCH_ALL); + if (err != CS_OK) + cluster_dead(0); +} + +/* Force re-read of quorum nodes */ +void update_cluster(void) +{ + cs_error_t err; + + err = quorum_dispatch(qh, CS_DISPATCH_ONE); + if (err != CS_OK) + cluster_dead(0); +} + +int setup_cluster(void) +{ + cs_error_t err; + int fd; + + INIT_LIST_HEAD(&cluster_nodes); + + err = quorum_initialize(&qh, &quorum_callbacks); + if (err != CS_OK) { + log_error("quorum init error %d", err); + return -1; + } + + err = quorum_fd_get(qh, &fd); + if (err != CS_OK) { + log_error("quorum fd_get error %d", err); + goto fail; + } + + err = quorum_trackstart(qh, CS_TRACK_CHANGES); + if (err != CS_OK) { + log_error("quorum trackstart error %d", err); + goto fail; + } + + old_node_count = 0; + memset(&old_nodes, 0, sizeof(old_nodes)); + quorum_node_count = 0; + memset(&quorum_nodes, 0, sizeof(quorum_nodes)); + + return fd; + fail: + quorum_finalize(qh); + return -1; +} + +void close_cluster(void) +{ + quorum_trackstop(qh); + quorum_finalize(qh); +} + +void kick_node_from_cluster(int nodeid) +{ + if (!nodeid) { + log_error("telling corosync to shut down cluster locally"); + corosync_cfg_try_shutdown(ch, + COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE); + } else { + log_error("telling corosync to remove nodeid %d from cluster", + nodeid); + corosync_cfg_kill_node(ch, nodeid, "dlm_controld"); + } +} + +static void shutdown_callback(corosync_cfg_handle_t h, + corosync_cfg_shutdown_flags_t flags) +{ + if (flags & COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) { + if (list_empty(&lockspaces)) + corosync_cfg_replyto_shutdown(ch, + COROSYNC_CFG_SHUTDOWN_FLAG_YES); + else { + log_debug("no to corosync shutdown"); + corosync_cfg_replyto_shutdown(ch, + COROSYNC_CFG_SHUTDOWN_FLAG_NO); + } + } +} + +static corosync_cfg_callbacks_t cfg_callbacks = +{ + .corosync_cfg_shutdown_callback = shutdown_callback, + .corosync_cfg_state_track_callback = NULL, +}; + +void process_cluster_cfg(int ci) +{ + cs_error_t err; + + err = corosync_cfg_dispatch(ch, CS_DISPATCH_ALL); + if (err != CS_OK) + cluster_dead(0); +} + +int setup_cluster_cfg(void) +{ + cs_error_t err; + unsigned int nodeid; + int fd; + + err = corosync_cfg_initialize(&ch, &cfg_callbacks); + if (err != CS_OK) { + log_error("corosync cfg init error %d", err); + return -1; + } + + err = corosync_cfg_fd_get(ch, &fd); + if (err != CS_OK) { + log_error("corosync cfg fd_get error %d", err); + corosync_cfg_finalize(ch); + return -1; + } + + err = corosync_cfg_local_get(ch, &nodeid); + if (err != CS_OK) { + log_error("corosync cfg local_get error %d", err); + corosync_cfg_finalize(ch); + return -1; + } + our_nodeid = nodeid; + log_debug("our_nodeid %d", our_nodeid); + + return fd; +} + +void close_cluster_cfg(void) +{ + corosync_cfg_finalize(ch); +} + diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c deleted file mode 100644 index d645911..0000000 --- a/dlm_controld/member_cman.c +++ /dev/null @@ -1,311 +0,0 @@ -/* - * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - */ - -#include "dlm_daemon.h" -#include <corosync/corotypes.h> -#include <corosync/cfg.h> -#include <corosync/quorum.h> - -static corosync_cfg_handle_t ch; -static quorum_handle_t qh; -static uint32_t old_nodes[MAX_NODES]; -static int old_node_count; -static uint32_t quorum_nodes[MAX_NODES]; -static int quorum_node_count; -static struct list_head cluster_nodes; - -struct node_cluster { - struct list_head list; - int nodeid; - - uint64_t cluster_add_time; - uint64_t cluster_rem_time; -}; - -static struct node_cluster *get_cluster_node(int nodeid, int create) -{ - struct node_cluster *node; - - list_for_each_entry(node, &cluster_nodes, list) { - if (node->nodeid == nodeid) - return node; - } - - if (!create) - return NULL; - - node = malloc(sizeof(struct node_cluster)); - if (!node) - return NULL; - - memset(node, 0, sizeof(struct node_cluster)); - node->nodeid = nodeid; - list_add(&node->list, &cluster_nodes); - return node; -} - -static void add_cluster_node(int nodeid, uint64_t now) -{ - struct node_cluster *node; - - node = get_cluster_node(nodeid, 1); - if (!node) - return; - node->cluster_add_time = now; -} - -static void rem_cluster_node(int nodeid, uint64_t now) -{ - struct node_cluster *node; - - node = get_cluster_node(nodeid, 0); - if (!node) - return; - node->cluster_rem_time = now; -} - -uint64_t cluster_add_time(int nodeid) -{ - struct node_cluster *node; - - node = get_cluster_node(nodeid, 0); - if (!node) - return 0; - - return node->cluster_add_time; -} - -static int is_member(uint32_t *node_list, int count, uint32_t nodeid) -{ - int i; - - for (i = 0; i < count; i++) { - if (node_list[i] == nodeid) - return 1; - } - return 0; -} - -static int is_old_member(uint32_t nodeid) -{ - return is_member(old_nodes, old_node_count, nodeid); -} - -int is_cluster_member(uint32_t nodeid) -{ - return is_member(quorum_nodes, quorum_node_count, nodeid); -} - -static void quorum_callback(quorum_handle_t h, uint32_t quorate, - uint64_t ring_seq, uint32_t node_list_entries, - uint32_t *node_list) -{ - corosync_cfg_node_address_t addrs[MAX_NODE_ADDRESSES]; - corosync_cfg_node_address_t *addrptr = addrs; - cs_error_t err; - int i, j, num_addrs; - uint64_t now = monotime(); - - if (!cluster_quorate && quorate) - quorate_time = now; - - cluster_quorate = quorate; - cluster_ringid_seq = (uint32_t)ring_seq; - - log_debug("cluster quorum %u seq %u nodes %u", - cluster_quorate, cluster_ringid_seq, node_list_entries); - - old_node_count = quorum_node_count; - memcpy(&old_nodes, &quorum_nodes, sizeof(old_nodes)); - - quorum_node_count = 0; - memset(&quorum_nodes, 0, sizeof(quorum_nodes)); - - for (i = 0; i < node_list_entries; i++) - quorum_nodes[quorum_node_count++] = node_list[i]; - - for (i = 0; i < old_node_count; i++) { - if (!is_cluster_member(old_nodes[i])) { - log_debug("cluster node %u removed seq %u", - old_nodes[i], cluster_ringid_seq); - rem_cluster_node(old_nodes[i], now); - del_configfs_node(old_nodes[i]); - } - } - - for (i = 0; i < quorum_node_count; i++) { - if (!is_old_member(quorum_nodes[i])) { - log_debug("cluster node %u added seq %u", - quorum_nodes[i], cluster_ringid_seq); - add_cluster_node(quorum_nodes[i], now); - - err = corosync_cfg_get_node_addrs(ch, quorum_nodes[i], - MAX_NODE_ADDRESSES, - &num_addrs, addrs); - if (err != CS_OK) { - log_error("corosync_cfg_get_node_addrs failed " - "nodeid %u", quorum_nodes[i]); - continue; - } - - for (j = 0; j < num_addrs; j++) { - add_configfs_node(quorum_nodes[i], - addrptr[j].address, - addrptr[j].address_length, - (quorum_nodes[i] == - our_nodeid)); - } - } - } -} - -static quorum_callbacks_t quorum_callbacks = -{ - .quorum_notify_fn = quorum_callback, -}; - -void process_cluster(int ci) -{ - cs_error_t err; - - err = quorum_dispatch(qh, CS_DISPATCH_ALL); - if (err != CS_OK) - cluster_dead(0); -} - -/* Force re-read of quorum nodes */ -void update_cluster(void) -{ - cs_error_t err; - - err = quorum_dispatch(qh, CS_DISPATCH_ONE); - if (err != CS_OK) - cluster_dead(0); -} - -int setup_cluster(void) -{ - cs_error_t err; - int fd; - - INIT_LIST_HEAD(&cluster_nodes); - - err = quorum_initialize(&qh, &quorum_callbacks); - if (err != CS_OK) { - log_error("quorum init error %d", err); - return -1; - } - - err = quorum_fd_get(qh, &fd); - if (err != CS_OK) { - log_error("quorum fd_get error %d", err); - goto fail; - } - - err = quorum_trackstart(qh, CS_TRACK_CHANGES); - if (err != CS_OK) { - log_error("quorum trackstart error %d", err); - goto fail; - } - - old_node_count = 0; - memset(&old_nodes, 0, sizeof(old_nodes)); - quorum_node_count = 0; - memset(&quorum_nodes, 0, sizeof(quorum_nodes)); - - return fd; - fail: - quorum_finalize(qh); - return -1; -} - -void close_cluster(void) -{ - quorum_trackstop(qh); - quorum_finalize(qh); -} - -void kick_node_from_cluster(int nodeid) -{ - if (!nodeid) { - log_error("telling corosync to shut down cluster locally"); - corosync_cfg_try_shutdown(ch, - COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE); - } else { - log_error("telling corosync to remove nodeid %d from cluster", - nodeid); - corosync_cfg_kill_node(ch, nodeid, "dlm_controld"); - } -} - -static void shutdown_callback(corosync_cfg_handle_t h, - corosync_cfg_shutdown_flags_t flags) -{ - if (flags & COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) { - if (list_empty(&lockspaces)) - corosync_cfg_replyto_shutdown(ch, - COROSYNC_CFG_SHUTDOWN_FLAG_YES); - else { - log_debug("no to corosync shutdown"); - corosync_cfg_replyto_shutdown(ch, - COROSYNC_CFG_SHUTDOWN_FLAG_NO); - } - } -} - -static corosync_cfg_callbacks_t cfg_callbacks = -{ - .corosync_cfg_shutdown_callback = shutdown_callback, - .corosync_cfg_state_track_callback = NULL, -}; - -void process_cluster_cfg(int ci) -{ - cs_error_t err; - - err = corosync_cfg_dispatch(ch, CS_DISPATCH_ALL); - if (err != CS_OK) - cluster_dead(0); -} - -int setup_cluster_cfg(void) -{ - cs_error_t err; - unsigned int nodeid; - int fd; - - err = corosync_cfg_initialize(&ch, &cfg_callbacks); - if (err != CS_OK) { - log_error("corosync cfg init error %d", err); - return -1; - } - - err = corosync_cfg_fd_get(ch, &fd); - if (err != CS_OK) { - log_error("corosync cfg fd_get error %d", err); - corosync_cfg_finalize(ch); - return -1; - } - - err = corosync_cfg_local_get(ch, &nodeid); - if (err != CS_OK) { - log_error("corosync cfg local_get error %d", err); - corosync_cfg_finalize(ch); - return -1; - } - our_nodeid = nodeid; - log_debug("our_nodeid %d", our_nodeid); - - return fd; -} - -void close_cluster_cfg(void) -{ - corosync_cfg_finalize(ch); -} -

1 0

dlm: master - dlm_controld: move fence code into separate file
by David Teigland 11 Oct '11

11 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=6011133ecf… Commit: 6011133ecf9899148970d979c0c1d930c6cfe474 Parent: a93c6d5bcb9ddf52fa524895a65ce3aedb71819b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Oct 11 13:58:49 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Oct 11 13:58:49 2011 -0500 dlm_controld: move fence code into separate file Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/Makefile | 1 + dlm_controld/dlm_daemon.h | 2 ++ dlm_controld/fence.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlm_controld/member_cman.c | 31 ------------------------------- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index 7bd37a1..a4cc5d7 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -25,6 +25,7 @@ LIB_TARGET = $(LIB_SO).$(LIB_MAJOR).$(LIB_MINOR) BIN_SOURCE = action.c \ cpg.c \ crc.c \ + fence.c \ main.c \ plock.c \ config.c \ diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 5209762..9d8cd52 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -341,6 +341,8 @@ int setup_cluster_cfg(void); void close_cluster_cfg(void); void process_cluster_cfg(int ci); void kick_node_from_cluster(int nodeid); + +/* fence.c */ int fence_node_time(int nodeid, uint64_t *last_fenced_time); int fence_in_progress(int *count); diff --git a/dlm_controld/fence.c b/dlm_controld/fence.c new file mode 100644 index 0000000..15271b6 --- /dev/null +++ b/dlm_controld/fence.c @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + +#include "dlm_daemon.h" +#include "libfenced.h" + +int fence_node_time(int nodeid, uint64_t *last_fenced_time) +{ + struct fenced_node nodeinfo; + int rv; + + memset(&nodeinfo, 0, sizeof(nodeinfo)); + + rv = fenced_node_info(nodeid, &nodeinfo); + if (rv < 0) + return rv; + + *last_fenced_time = nodeinfo.last_fenced_time; + return 0; +} + +int fence_in_progress(int *count) +{ + struct fenced_domain domain; + int rv; + + memset(&domain, 0, sizeof(domain)); + + rv = fenced_domain_info(&domain); + if (rv < 0) + return rv; + + *count = domain.victim_count; + return 0; +} + diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index 6bfb2a9..d645911 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -10,7 +10,6 @@ #include <corosync/corotypes.h> #include <corosync/cfg.h> #include <corosync/quorum.h> -#include "libfenced.h" static corosync_cfg_handle_t ch; static quorum_handle_t qh; @@ -310,33 +309,3 @@ void close_cluster_cfg(void) corosync_cfg_finalize(ch); } -int fence_node_time(int nodeid, uint64_t *last_fenced_time) -{ - struct fenced_node nodeinfo; - int rv; - - memset(&nodeinfo, 0, sizeof(nodeinfo)); - - rv = fenced_node_info(nodeid, &nodeinfo); - if (rv < 0) - return rv; - - *last_fenced_time = nodeinfo.last_fenced_time; - return 0; -} - -int fence_in_progress(int *count) -{ - struct fenced_domain domain; - int rv; - - memset(&domain, 0, sizeof(domain)); - - rv = fenced_domain_info(&domain); - if (rv < 0) - return rv; - - *count = domain.victim_count; - return 0; -} -

1 0

dlm: master - dlm_controld: reorganize quorum/fencing checks
by David Teigland 11 Oct '11

11 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=a93c6d5bcb… Commit: a93c6d5bcb9ddf52fa524895a65ce3aedb71819b Parent: d4cf6836ee60d12d07841b44986cf443a8b4f2ce Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Oct 11 13:49:10 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Oct 11 13:49:10 2011 -0500 dlm_controld: reorganize quorum/fencing checks prepare for different fencing system(s) Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 70 ++++++++++++++++++++++++++++++--------------- dlm_controld/dlm_daemon.h | 2 +- dlm_controld/main.c | 2 +- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 4bf7d1d..1d238ed 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -71,6 +71,7 @@ struct node { int check_fs; int fs_notified; + int request_fencing; int check_fencing; uint64_t fail_realtime; uint64_t fence_realtime; @@ -525,6 +526,7 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, } if (cfgd_enable_fencing && node->start_time) { + node->request_fencing = 1; node->check_fencing = 1; node->fence_realtime = 0; node->fence_queries = 0; @@ -650,6 +652,34 @@ static int check_fencing_done(struct lockspace *ls) return 1; } +static int need_fencing(struct lockspace *ls) +{ + struct node *node; + + list_for_each_entry(node, &ls->node_history, list) { + if (node->check_fencing) + return 1; + } + return 0; +} + +static void request_fencing(struct lockspace *ls) +{ + struct node *node; + + list_for_each_entry(node, &ls->node_history, list) { + if (!node->request_fencing) + continue; + + /* we don't need to ask fenced to initiate fencing; it does + so itself when it sees a fence domain member fail. Without + fenced we'll probably need to ask another daemon to initiate + fencing, then check with it above, like we check libfenced. */ + + node->request_fencing = 0; + } +} + /* we know that the quorum value here is consistent with the cpg events because the ringid's are in sync per the previous check_ringid_done */ @@ -661,11 +691,11 @@ static int check_quorum_done(struct lockspace *ls) } if (!cluster_quorate) { - log_debug("check_quorum not quorate"); + log_group(ls, "check_quorum not quorate"); return 0; } - log_debug("check_quorum done"); + log_group(ls, "check_quorum done"); return 1; } @@ -791,34 +821,28 @@ static void stop_kernel(struct lockspace *ls, uint32_t seq) don't need to check for because stop_kernel(), which is synchronous, was done when the change was created */ +/* the fencing/quorum/fs conditions need to account for all the changes + that have occured since the last change applied to dlm-kernel, not + just the latest change */ + static int wait_conditions_done(struct lockspace *ls) { - if (!check_ringid_done(ls)) { - poll_ringid++; + if (!check_ringid_done(ls)) return 0; - } - /* the fencing/quorum/fs conditions need to account for all the changes - that have occured since the last change applied to dlm-kernel, not - just the latest change */ + /* It's convenient to be able to join and leave lockspaces without + having quorum. If the fencing system does not wait for quorum + before carrying out fencing requests, then we may want to wait for + quorum here before requesting fencing, to avoid having partitioned + nodes fence good nodes. */ - if (!check_fencing_done(ls)) { - poll_fencing++; + if (need_fencing(ls) && !check_quorum_done(ls)) return 0; - } - /* fencing waits for quorum, so we don't need to check quorum for any - reasons related to safety or protection, so enable_quorum defaults - to 0. This does mean that lockspaces (and cluster fs's) can be - started/enabled in an inquorate cluster if there are no outstanding - fencing operations. Some users or apps may want lockspaces/fs's to - only be enabled in a quorate cluster; enable_quorum can be set to 1 - to get that behavior. The main advantage of not waiting for quorum - here is to allow lockspaces to be shut down (and cluster fs's - unmounted) in an inquorate cluster. */ + request_fencing(ls); - if (!check_quorum_done(ls)) { - poll_quorum++; + if (!check_fencing_done(ls)) { + poll_fencing++; return 0; } @@ -1903,7 +1927,7 @@ int dlm_join_lockspace(struct lockspace *ls) /* TODO: allow global_id to be set in cluster.conf? */ ls->global_id = cpgname_to_crc(name.value, name.length); - log_debug("cpg_join %s ...", name.value); + log_group(ls, "cpg_join %s ...", name.value); retry: error = cpg_join(h, &name); if (error == CPG_ERR_TRY_AGAIN) { diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 6129477..5209762 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -81,7 +81,7 @@ #define DEFAULT_DEBUG_LOGFILE 0 #define DEFAULT_ENABLE_FENCING 1 -#define DEFAULT_ENABLE_QUORUM 0 +#define DEFAULT_ENABLE_QUORUM 1 #define DEFAULT_ENABLE_PLOCK 1 #define DEFAULT_PLOCK_DEBUG 0 #define DEFAULT_PLOCK_RATE_LIMIT 0 diff --git a/dlm_controld/main.c b/dlm_controld/main.c index 822a6a5..d28cc23 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -969,7 +969,7 @@ static void loop(void) poll_timeout = -1; - if (poll_fencing || poll_quorum || poll_fs) { + if (poll_fencing || poll_fs) { process_lockspace_changes(); poll_timeout = 1000; }

1 0

dlm: master - dlm_controld: use monotonic times
by David Teigland 07 Oct '11

07 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=d4cf6836ee… Commit: d4cf6836ee60d12d07841b44986cf443a8b4f2ce Parent: d218916fd8a4132d2b4df8b7853ad419b3538637 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Oct 7 15:46:12 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Oct 7 15:46:12 2011 -0500 dlm_controld: use monotonic times except for value compared to time from fenced which is still real time Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 26 +++++++++++++++----------- dlm_controld/member_cman.c | 2 +- dlm_controld/plock.c | 12 ++++++------ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 4dc2bc2..4bf7d1d 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -72,7 +72,8 @@ struct node { int fs_notified; int check_fencing; - uint64_t fence_time; /* for debug */ + uint64_t fail_realtime; + uint64_t fence_realtime; uint32_t fence_queries; /* for debug */ }; @@ -525,7 +526,7 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, if (cfgd_enable_fencing && node->start_time) { node->check_fencing = 1; - node->fence_time = 0; + node->fence_realtime = 0; node->fence_queries = 0; } @@ -540,6 +541,7 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, node->lockspace_fail_time = now; node->lockspace_fail_seq = node->lockspace_rem_seq; node->lockspace_fail_reason = reason; /* for queries */ + node->fail_realtime = time(NULL); } static void node_history_start(struct lockspace *ls, int nodeid) @@ -552,7 +554,7 @@ static void node_history_start(struct lockspace *ls, int nodeid) return; } - node->start_time = time(NULL); + node->start_time = monotime(); } /* wait for cluster ringid and cpg ringid to be the same so we know our @@ -596,31 +598,33 @@ static int check_fencing_done(struct lockspace *ls) if (rv < 0) log_error("fenced_node_info error %d", rv); + /* fenced gives us real time */ + /* need >= not just > because in at least one case we've seen fenced_time within the same second as fail_time: with external fencing, e.g. fence_node */ - if (last_fenced_time >= node->lockspace_fail_time) { + if (last_fenced_time >= node->fail_realtime) { log_group(ls, "check_fencing %d done " "start %llu fail %llu last %llu", node->nodeid, (unsigned long long)node->start_time, - (unsigned long long)node->lockspace_fail_time, + (unsigned long long)node->fail_realtime, (unsigned long long)last_fenced_time); node->check_fencing = 0; node->start_time = 0; - node->fence_time = last_fenced_time; + node->fence_realtime = last_fenced_time; } else { if (!node->fence_queries || - node->fence_time != last_fenced_time) { + node->fence_realtime != last_fenced_time) { log_group(ls, "check_fencing %d wait " "start %llu fail %llu last %llu", node->nodeid, (unsigned long long)node->start_time, - (unsigned long long)node->lockspace_fail_time, + (unsigned long long)node->fail_realtime, (unsigned long long)last_fenced_time); node->fence_queries++; - node->fence_time = last_fenced_time; + node->fence_realtime = last_fenced_time; } wait_count++; } @@ -1415,7 +1419,7 @@ static int add_change(struct lockspace *ls, struct change *cg; struct member *memb; int i, error; - uint64_t now = time(NULL); + uint64_t now = monotime(); cg = malloc(sizeof(struct change)); if (!cg) @@ -2418,7 +2422,7 @@ static void confchg_cb_daemon(cpg_handle_t handle, size_t joined_list_entries) { struct node_daemon *node; - uint64_t now = time(NULL); + uint64_t now = monotime(); int i; log_config(group_name, member_list, member_list_entries, diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index f7a099c..6bfb2a9 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -110,7 +110,7 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, corosync_cfg_node_address_t *addrptr = addrs; cs_error_t err; int i, j, num_addrs; - uint64_t now = time(NULL); + uint64_t now = monotime(); if (!cluster_quorate && quorate) quorate_time = now; diff --git a/dlm_controld/plock.c b/dlm_controld/plock.c index d475cf4..3e48267 100644 --- a/dlm_controld/plock.c +++ b/dlm_controld/plock.c @@ -813,11 +813,11 @@ static void __receive_plock(struct lockspace *ls, struct dlm_plock_info *in, { switch (in->optype) { case DLM_PLOCK_OP_LOCK: - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); do_lock(ls, in, r); break; case DLM_PLOCK_OP_UNLOCK: - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); do_unlock(ls, in, r); break; case DLM_PLOCK_OP_GET: @@ -1132,7 +1132,7 @@ static void _receive_own(struct lockspace *ls, struct dlm_header *hd, int len) int from = hd->nodeid; int rv; - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); memcpy(&info, (char *)hd + sizeof(struct dlm_header), sizeof(info)); info_bswap_in(&info); @@ -1305,7 +1305,7 @@ static void _receive_sync(struct lockspace *ls, struct dlm_header *hd, int len) int from = hd->nodeid; int rv; - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); memcpy(&info, (char *)hd + sizeof(struct dlm_header), sizeof(info)); info_bswap_in(&info); @@ -1352,7 +1352,7 @@ static void _receive_drop(struct lockspace *ls, struct dlm_header *hd, int len) int from = hd->nodeid; int rv; - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); memcpy(&info, (char *)hd + sizeof(struct dlm_header), sizeof(info)); info_bswap_in(&info); @@ -2072,7 +2072,7 @@ void purge_plocks(struct lockspace *ls, int nodeid, int unmount) } if (purged) - ls->last_plock_time = time(NULL); + ls->last_plock_time = monotime(); log_dlock(ls, "purged %d plocks for %d", purged, nodeid); }

1 0

dlm: master - dlm_controld: move cluster times out of lockspace structs
by David Teigland 07 Oct '11

07 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=d218916fd8… Commit: d218916fd8a4132d2b4df8b7853ad419b3538637 Parent: 1409a84a8a56ce77c86cbc1458aa44ea43844e98 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Oct 7 15:22:48 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Oct 7 15:22:48 2011 -0500 dlm_controld: move cluster times out of lockspace structs more sense to keep it in a single spot Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 81 +++++++++++++------------------------------ dlm_controld/dlm_daemon.h | 4 +-- dlm_controld/member_cman.c | 71 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 94 insertions(+), 62 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 24e82b5..4dc2bc2 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -57,10 +57,6 @@ struct node { struct list_head list; int nodeid; - uint64_t cluster_add_time; - uint64_t cluster_rem_time; - int cluster_member; - uint64_t lockspace_add_time; uint64_t lockspace_rem_time; uint64_t lockspace_fail_time; @@ -481,40 +477,8 @@ static struct node *get_node_history_create(struct lockspace *ls, int nodeid) return node; } -void node_history_cluster_add(int nodeid) -{ - struct lockspace *ls; - struct node *node; - - list_for_each_entry(ls, &lockspaces, list) { - node = get_node_history_create(ls, nodeid); - if (!node) { - log_error("node_history_cluster_add no nodeid %d", nodeid); - return; - } - node->cluster_add_time = time(NULL); - node->cluster_member = 1; - } -} - -void node_history_cluster_rem(int nodeid) -{ - struct lockspace *ls; - struct node *node; - - list_for_each_entry(ls, &lockspaces, list) { - node = get_node_history(ls, nodeid); - if (!node) { - log_error("node_history_cluster_rem no nodeid %d", nodeid); - return; - } - node->cluster_rem_time = time(NULL); - node->cluster_member = 0; - } -} - static void node_history_lockspace_add(struct lockspace *ls, int nodeid, - struct change *cg) + struct change *cg, uint64_t now) { struct node *node; @@ -524,13 +488,13 @@ static void node_history_lockspace_add(struct lockspace *ls, int nodeid, return; } - node->lockspace_add_time = time(NULL); + node->lockspace_add_time = now; node->lockspace_add_seq = cg->seq; node->lockspace_member = 1; } static void node_history_lockspace_left(struct lockspace *ls, int nodeid, - struct change *cg) + struct change *cg, uint64_t now) { struct node *node; @@ -542,13 +506,14 @@ static void node_history_lockspace_left(struct lockspace *ls, int nodeid, node->start_time = 0; - node->lockspace_rem_time = time(NULL); + node->lockspace_rem_time = now; node->lockspace_rem_seq = cg->seq; /* for queries */ node->lockspace_member = 0; } static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, - struct change *cg, int reason) + struct change *cg, int reason, + uint64_t now) { struct node *node; @@ -569,10 +534,10 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, node->check_fs = 1; } - node->lockspace_rem_time = time(NULL); + node->lockspace_rem_time = now; node->lockspace_rem_seq = cg->seq; /* for queries */ node->lockspace_member = 0; - node->lockspace_fail_time = node->lockspace_rem_time; + node->lockspace_fail_time = now; node->lockspace_fail_seq = node->lockspace_rem_seq; node->lockspace_fail_reason = reason; /* for queries */ } @@ -596,13 +561,13 @@ static void node_history_start(struct lockspace *ls, int nodeid) static int check_ringid_done(struct lockspace *ls) { if (cluster_ringid_seq != (uint32_t)ls->cpg_ringid.seq) { - log_debug("check_ringid cluster %u cpg %u:%llu", + log_group(ls, "check_ringid cluster %u cpg %u:%llu", cluster_ringid_seq, ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 0; } - log_debug("check_ringid done cluster %u cpg %u:%llu", + log_group(ls, "check_ringid done cluster %u cpg %u:%llu", cluster_ringid_seq, ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 1; @@ -967,6 +932,7 @@ static int match_change(struct lockspace *ls, struct change *cg, struct id_info *id; struct member *memb; struct node *node; + uint64_t t; uint32_t seq = hd->msgdata; int i, members_mismatch; @@ -1012,11 +978,12 @@ static int match_change(struct lockspace *ls, struct change *cg, return 0; } - if (node->cluster_add_time > cg->create_time) { + t = cluster_add_time(node->nodeid); + if (t > cg->create_time) { log_group(ls, "match_change %d:%u skip cg %u created %llu " "cluster add %llu", hd->nodeid, seq, cg->seq, (unsigned long long)cg->create_time, - (unsigned long long)node->cluster_add_time); + (unsigned long long)t); return 0; } @@ -1448,6 +1415,7 @@ static int add_change(struct lockspace *ls, struct change *cg; struct member *memb; int i, error; + uint64_t now = time(NULL); cg = malloc(sizeof(struct change)); if (!cg) @@ -1456,7 +1424,7 @@ static int add_change(struct lockspace *ls, INIT_LIST_HEAD(&cg->members); INIT_LIST_HEAD(&cg->removed); cg->state = CGST_WAIT_CONDITIONS; - cg->create_time = time(NULL); + cg->create_time = now; cg->seq = ++ls->change_seq; if (!cg->seq) cg->seq = ++ls->change_seq; @@ -1489,9 +1457,9 @@ static int add_change(struct lockspace *ls, if (memb->failed) { node_history_lockspace_fail(ls, memb->nodeid, cg, - left_list[i].reason); + left_list[i].reason, now); } else { - node_history_lockspace_left(ls, memb->nodeid, cg); + node_history_lockspace_left(ls, memb->nodeid, cg, now); } log_group(ls, "add_change cg %u remove nodeid %d reason %d", @@ -1513,7 +1481,7 @@ static int add_change(struct lockspace *ls, if (memb->nodeid == our_nodeid) { cg->we_joined = 1; } else { - node_history_lockspace_add(ls, memb->nodeid, cg); + node_history_lockspace_add(ls, memb->nodeid, cg, now); } log_group(ls, "add_change cg %u joined nodeid %d", cg->seq, @@ -1523,7 +1491,7 @@ static int add_change(struct lockspace *ls, if (cg->we_joined) { log_group(ls, "add_change cg %u we joined", cg->seq); list_for_each_entry(memb, &cg->members, list) { - node_history_lockspace_add(ls, memb->nodeid, cg); + node_history_lockspace_add(ls, memb->nodeid, cg, now); } } @@ -2005,12 +1973,12 @@ static void add_node_daemon(int nodeid) if (get_node_daemon(nodeid)) return; - node = malloc(sizeof(struct node)); + node = malloc(sizeof(struct node_daemon)); if (!node) { log_error("add_node_daemon no mem"); return; } - memset(node, 0, sizeof(struct node)); + memset(node, 0, sizeof(struct node_daemon)); node->nodeid = nodeid; list_add_tail(&node->list, &daemon_nodes); } @@ -2450,6 +2418,7 @@ static void confchg_cb_daemon(cpg_handle_t handle, size_t joined_list_entries) { struct node_daemon *node; + uint64_t now = time(NULL); int i; log_config(group_name, member_list, member_list_entries, @@ -2475,7 +2444,7 @@ static void confchg_cb_daemon(cpg_handle_t handle, /* node joined daemon cpg */ node->daemon_member = 1; - node->daemon_add_time = time(NULL); + node->daemon_add_time = now; } else { if (!node->daemon_member) continue; @@ -2484,7 +2453,7 @@ static void confchg_cb_daemon(cpg_handle_t handle, node->daemon_member = 0; node->killed = 0; memset(&node->proto, 0, sizeof(struct protocol)); - node->daemon_rem_time = time(NULL); + node->daemon_rem_time = now; } } } diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 61bd78d..6129477 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -199,7 +199,6 @@ enum { #define DLM_MFLG_HAVEPLOCK 2 /* accompanies start, we have plock state */ #define DLM_MFLG_NACK 4 /* accompanies start, prevent wrong match when two outstanding changes are the same */ -#define DLM_MFLG_PLOCK_SIG 8 /* msgdata2 is a plock signature */ struct dlm_header { uint16_t version[3]; @@ -294,8 +293,6 @@ int dlm_join_lockspace(struct lockspace *ls); int dlm_leave_lockspace(struct lockspace *ls); const char *msg_name(int type); void update_flow_control_status(void); -void node_history_cluster_add(int nodeid); -void node_history_cluster_rem(int nodeid); int set_node_info(struct lockspace *ls, int nodeid, struct dlmc_node *node); int set_lockspace_info(struct lockspace *ls, struct dlmc_lockspace *lockspace); int set_lockspaces(int *count, struct dlmc_lockspace **lss_out); @@ -338,6 +335,7 @@ int setup_cluster(void); void close_cluster(void); void process_cluster(int ci); void update_cluster(void); +uint64_t cluster_add_time(int nodeid); int is_cluster_member(uint32_t nodeid); int setup_cluster_cfg(void); void close_cluster_cfg(void); diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index ec005c3..f7a099c 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -18,6 +18,68 @@ static uint32_t old_nodes[MAX_NODES]; static int old_node_count; static uint32_t quorum_nodes[MAX_NODES]; static int quorum_node_count; +static struct list_head cluster_nodes; + +struct node_cluster { + struct list_head list; + int nodeid; + + uint64_t cluster_add_time; + uint64_t cluster_rem_time; +}; + +static struct node_cluster *get_cluster_node(int nodeid, int create) +{ + struct node_cluster *node; + + list_for_each_entry(node, &cluster_nodes, list) { + if (node->nodeid == nodeid) + return node; + } + + if (!create) + return NULL; + + node = malloc(sizeof(struct node_cluster)); + if (!node) + return NULL; + + memset(node, 0, sizeof(struct node_cluster)); + node->nodeid = nodeid; + list_add(&node->list, &cluster_nodes); + return node; +} + +static void add_cluster_node(int nodeid, uint64_t now) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 1); + if (!node) + return; + node->cluster_add_time = now; +} + +static void rem_cluster_node(int nodeid, uint64_t now) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 0); + if (!node) + return; + node->cluster_rem_time = now; +} + +uint64_t cluster_add_time(int nodeid) +{ + struct node_cluster *node; + + node = get_cluster_node(nodeid, 0); + if (!node) + return 0; + + return node->cluster_add_time; +} static int is_member(uint32_t *node_list, int count, uint32_t nodeid) { @@ -48,9 +110,10 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, corosync_cfg_node_address_t *addrptr = addrs; cs_error_t err; int i, j, num_addrs; + uint64_t now = time(NULL); if (!cluster_quorate && quorate) - quorate_time = time(NULL); + quorate_time = now; cluster_quorate = quorate; cluster_ringid_seq = (uint32_t)ring_seq; @@ -71,7 +134,7 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, if (!is_cluster_member(old_nodes[i])) { log_debug("cluster node %u removed seq %u", old_nodes[i], cluster_ringid_seq); - node_history_cluster_rem(old_nodes[i]); + rem_cluster_node(old_nodes[i], now); del_configfs_node(old_nodes[i]); } } @@ -80,7 +143,7 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, if (!is_old_member(quorum_nodes[i])) { log_debug("cluster node %u added seq %u", quorum_nodes[i], cluster_ringid_seq); - node_history_cluster_add(quorum_nodes[i]); + add_cluster_node(quorum_nodes[i], now); err = corosync_cfg_get_node_addrs(ch, quorum_nodes[i], MAX_NODE_ADDRESSES, @@ -131,6 +194,8 @@ int setup_cluster(void) cs_error_t err; int fd; + INIT_LIST_HEAD(&cluster_nodes); + err = quorum_initialize(&qh, &quorum_callbacks); if (err != CS_OK) { log_error("quorum init error %d", err);

1 0

dlm: master - dlm_controld: keep track of ringid and stateful
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=1409a84a8a… Commit: 1409a84a8a56ce77c86cbc1458aa44ea43844e98 Parent: 90bf062ed3f8d89f27046ef2c4216bd6e6cc9c49 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 17:08:08 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 17:08:08 2011 -0500 dlm_controld: keep track of ringid and stateful copy some code from fenced for keeping track of ringid and stateful merges Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 291 +++++++++++++++++++++++++++++++++++--------- dlm_controld/dlm_daemon.h | 4 +- dlm_controld/member_cman.c | 2 + 3 files changed, 236 insertions(+), 61 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index fa328d0..24e82b5 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -8,6 +8,8 @@ #include "dlm_daemon.h" +#define PV_STATEFUL 0x0001 + struct protocol_version { uint16_t major; uint16_t minor; @@ -40,6 +42,12 @@ struct node_daemon { struct list_head list; int nodeid; + uint64_t daemon_add_time; + uint64_t daemon_rem_time; + int daemon_member; + + int killed; + struct protocol proto; }; @@ -58,17 +66,16 @@ struct node { uint64_t lockspace_fail_time; uint32_t lockspace_add_seq; uint32_t lockspace_rem_seq; + uint32_t lockspace_fail_seq; int lockspace_member; int lockspace_fail_reason; uint64_t start_time; - int check_fencing; - int check_quorum; int check_fs; - int fs_notified; + int check_fencing; uint64_t fence_time; /* for debug */ uint32_t fence_queries; /* for debug */ }; @@ -183,6 +190,32 @@ static void log_config(const struct cpg_name *group_name, m_buf, j_buf, l_buf); } +static void log_ringid(const char *name, + struct cpg_ring_id *ringid, + const uint32_t *member_list, + size_t member_list_entries) +{ + char m_buf[128]; + size_t i, len, pos; + int ret; + + memset(m_buf, 0, sizeof(m_buf)); + + len = sizeof(m_buf); + pos = 0; + for (i = 0; i < member_list_entries; i++) { + ret = snprintf(m_buf + pos, len - pos, " %u", + member_list[i]); + if (ret >= len - pos) + break; + pos += ret; + } + + log_debug("%s ring %u:%llu %zu memb%s", + name, ringid->nodeid, (unsigned long long)ringid->seq, + member_list_entries, m_buf); +} + static void ls_info_in(struct ls_info *li) { li->ls_info_size = le32_to_cpu(li->ls_info_size); @@ -531,12 +564,6 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, node->fence_queries = 0; } - /* fenced will take care of making sure the quorum value - is adjusted for all the failures */ - - if (cfgd_enable_quorum && !cfgd_enable_fencing) - node->check_quorum = 1; - if (ls->fs_registered) { log_group(ls, "check_fs nodeid %d set", nodeid); node->check_fs = 1; @@ -545,8 +572,9 @@ static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, node->lockspace_rem_time = time(NULL); node->lockspace_rem_seq = cg->seq; /* for queries */ node->lockspace_member = 0; - node->lockspace_fail_reason = reason; /* for queries */ node->lockspace_fail_time = node->lockspace_rem_time; + node->lockspace_fail_seq = node->lockspace_rem_seq; + node->lockspace_fail_reason = reason; /* for queries */ } static void node_history_start(struct lockspace *ls, int nodeid) @@ -562,6 +590,24 @@ static void node_history_start(struct lockspace *ls, int nodeid) node->start_time = time(NULL); } +/* wait for cluster ringid and cpg ringid to be the same so we know our + information from each service is based on the same node state */ + +static int check_ringid_done(struct lockspace *ls) +{ + if (cluster_ringid_seq != (uint32_t)ls->cpg_ringid.seq) { + log_debug("check_ringid cluster %u cpg %u:%llu", + cluster_ringid_seq, ls->cpg_ringid.nodeid, + (unsigned long long)ls->cpg_ringid.seq); + return 0; + } + + log_debug("check_ringid done cluster %u cpg %u:%llu", + cluster_ringid_seq, ls->cpg_ringid.nodeid, + (unsigned long long)ls->cpg_ringid.seq); + return 1; +} + static int check_fencing_done(struct lockspace *ls) { struct node *node; @@ -635,42 +681,22 @@ static int check_fencing_done(struct lockspace *ls) return 1; } +/* we know that the quorum value here is consistent with the cpg events + because the ringid's are in sync per the previous check_ringid_done */ + static int check_quorum_done(struct lockspace *ls) { - struct node *node; - int wait_count = 0; - if (!cfgd_enable_quorum) { log_group(ls, "check_quorum disabled"); return 1; } - /* wait for quorum system (cman) to see all the same nodes failed, so - we know that cluster_quorate is adjusted for the same failures we've - seen (see comment in fenced about the assumption here) */ - - list_for_each_entry(node, &ls->node_history, list) { - if (!node->check_quorum) - continue; - - if (!is_cluster_member(node->nodeid)) { - node->check_quorum = 0; - } else { - log_group(ls, "check_quorum nodeid %d is_cluster_member", - node->nodeid); - wait_count++; - } - } - - if (wait_count) - return 0; - if (!cluster_quorate) { - log_group(ls, "check_quorum not quorate"); + log_debug("check_quorum not quorate"); return 0; } - log_group(ls, "check_quorum done"); + log_debug("check_quorum done"); return 1; } @@ -798,6 +824,11 @@ static void stop_kernel(struct lockspace *ls, uint32_t seq) static int wait_conditions_done(struct lockspace *ls) { + if (!check_ringid_done(ls)) { + poll_ringid++; + return 0; + } + /* the fencing/quorum/fs conditions need to account for all the changes that have occured since the last change applied to dlm-kernel, not just the latest change */ @@ -1235,6 +1266,11 @@ static void send_info(struct lockspace *ls, struct change *cg, int type, free(buf); } +/* fenced used the DUPLICATE_CG flag instead of sending nacks like we + do here. I think the nacks didn't work for fenced for some reason, + but I don't remember why (possibly because the node blocked doing + the fencing hadn't created the cg to nack yet). */ + static void send_start(struct lockspace *ls, struct change *cg) { log_group(ls, "send_start %d:%u counts %u %d %d %d %d", @@ -1373,6 +1409,7 @@ static void apply_changes(struct lockspace *ls) case CGST_WAIT_MESSAGES: if (wait_messages_done(ls)) { + our_protocol.dr_ver.flags |= PV_STATEFUL; start_kernel(ls); prepare_plocks(ls); cleanup_changes(ls); @@ -1388,6 +1425,7 @@ void process_lockspace_changes(void) { struct lockspace *ls, *safe; + poll_ringid = 0; poll_fencing = 0; poll_quorum = 0; poll_fs = 0; @@ -1767,9 +1805,40 @@ static void deliver_cb(cpg_handle_t handle, apply_changes(ls); } -static cpg_callbacks_t cpg_callbacks = { +/* save ringid to compare with cman's. + also save member_list to double check with cman's member list? + they should match */ + +static void totem_cb(cpg_handle_t handle, + struct cpg_ring_id ring_id, + uint32_t member_list_entries, + const uint32_t *member_list) +{ + struct lockspace *ls; + char name[128]; + + ls = find_ls_handle(handle); + if (!ls) { + log_error("totem_cb no lockspace for handle"); + return; + } + + memset(&name, 0, sizeof(name)); + sprintf(name, "dlm:ls:%s", ls->name); + + log_ringid(name, &ring_id, member_list, member_list_entries); + + ls->cpg_ringid.nodeid = ring_id.nodeid; + ls->cpg_ringid.seq = ring_id.seq; + + apply_changes(ls); +} + +static cpg_model_v1_data_t cpg_callbacks = { .cpg_deliver_fn = deliver_cb, .cpg_confchg_fn = confchg_cb, + .cpg_totem_confchg_fn = totem_cb, + .flags = CPG_MODEL_V1_DELIVER_INITIAL_TOTEM_CONF, }; void update_flow_control_status(void) @@ -1834,9 +1903,10 @@ int dlm_join_lockspace(struct lockspace *ls) goto fail_free; } - error = cpg_initialize(&h, &cpg_callbacks); + error = cpg_model_initialize(&h, CPG_MODEL_V1, + (cpg_model_data_t *)&cpg_callbacks, NULL); if (error != CPG_OK) { - log_error("cpg_initialize error %d", error); + log_error("cpg_model_initialize error %d", error); rv = -1; goto fail_free; } @@ -1861,6 +1931,7 @@ int dlm_join_lockspace(struct lockspace *ls) /* TODO: allow global_id to be set in cluster.conf? */ ls->global_id = cpgname_to_crc(name.value, name.length); + log_debug("cpg_join %s ...", name.value); retry: error = cpg_join(h, &name); if (error == CPG_ERR_TRY_AGAIN) { @@ -2123,30 +2194,83 @@ static void receive_protocol(struct dlm_header *hd, int len) return; } - /* if we have zero run values, and this msg has non-zero run values, - then adopt them as ours; otherwise save this proto message */ + /* save this node's proto so we can tell when we've got all, and + use it to select a minimum protocol from all */ - if (our_protocol.daemon_run[0]) + node = get_node_daemon(hd->nodeid); + if (!node) { + log_error("receive_protocol no node %d", hd->nodeid); return; + } - if (p->daemon_run[0]) { - memcpy(&our_protocol.daemon_run, &p->daemon_run, - sizeof(struct protocol_version)); - memcpy(&our_protocol.kernel_run, &p->kernel_run, - sizeof(struct protocol_version)); - log_debug("run protocol from nodeid %d", hd->nodeid); + if (!node->daemon_member) { + log_error("receive_protocol node %d not member", hd->nodeid); return; } - /* save this node's proto so we can tell when we've got all, and - use it to select a minimum protocol from all */ + log_debug("receive_protocol from %d max %u.%u.%u.%x run %u.%u.%u.%x", + hd->nodeid, + p->daemon_max[0], p->daemon_max[1], + p->daemon_max[2], p->daemon_max[3], + p->daemon_run[0], p->daemon_run[1], + p->daemon_run[2], p->daemon_run[3]); + log_debug("daemon node %d max %u.%u.%u.%x run %u.%u.%u.%x", + hd->nodeid, + node->proto.daemon_max[0], node->proto.daemon_max[1], + node->proto.daemon_max[2], node->proto.daemon_max[3], + node->proto.daemon_run[0], node->proto.daemon_run[1], + node->proto.daemon_run[2], node->proto.daemon_run[3]); + log_debug("daemon node %d join %llu left %llu local quorum %llu", + hd->nodeid, + (unsigned long long)node->daemon_add_time, + (unsigned long long)node->daemon_rem_time, + (unsigned long long)quorate_time); + + /* checking zero node->daemon_max[0] is a way to tell if we've received + an acceptable (non-stateful) proto message from the node since we + saw it join the daemon cpg */ + + if (hd->nodeid != our_nodeid && + !node->proto.daemon_max[0] && + (p->dr_ver.flags & PV_STATEFUL) && + (our_protocol.dr_ver.flags & PV_STATEFUL)) { + + log_debug("daemon node %d stateful merge", hd->nodeid); + + if (cluster_quorate && node->daemon_rem_time && + quorate_time < node->daemon_rem_time) { + log_debug("daemon node %d kill due to stateful merge", hd->nodeid); + if (!node->killed) + kick_node_from_cluster(hd->nodeid); + node->killed = 1; + } + + /* don't save p->proto into node->proto; we need to come + through here based on zero daemon_max[0] for other proto + messages like this one from the same node */ - node = get_node_daemon(hd->nodeid); - if (!node) { - log_error("receive_protocol no node %d", hd->nodeid); return; } + memcpy(&node->proto, p, sizeof(struct protocol)); + + /* if we have zero run values, and this msg has non-zero run values, + then adopt them as ours; otherwise save this proto message */ + + if (our_protocol.daemon_run[0]) + return; + + if (p->daemon_run[0]) { + our_protocol.daemon_run[0] = p->daemon_run[0]; + our_protocol.daemon_run[1] = p->daemon_run[1]; + our_protocol.daemon_run[2] = p->daemon_run[2]; + + our_protocol.kernel_run[0] = p->kernel_run[0]; + our_protocol.kernel_run[1] = p->kernel_run[1]; + our_protocol.kernel_run[2] = p->kernel_run[2]; + + log_debug("run protocol from nodeid %d", hd->nodeid); + } } static void send_protocol(struct protocol *proto) @@ -2305,6 +2429,17 @@ static void deliver_cb_daemon(cpg_handle_t handle, } } +static int in_daemon_member_list(int nodeid) +{ + int i; + + for (i = 0; i < daemon_member_count; i++) { + if (daemon_member[i].nodeid == nodeid) + return 1; + } + return 0; +} + static void confchg_cb_daemon(cpg_handle_t handle, const struct cpg_name *group_name, const struct cpg_address *member_list, @@ -2314,6 +2449,7 @@ static void confchg_cb_daemon(cpg_handle_t handle, const struct cpg_address *joined_list, size_t joined_list_entries) { + struct node_daemon *node; int i; log_config(group_name, member_list, member_list_entries, @@ -2328,13 +2464,44 @@ static void confchg_cb_daemon(cpg_handle_t handle, for (i = 0; i < member_list_entries; i++) { daemon_member[i] = member_list[i]; + /* add struct for nodes we've not seen before */ add_node_daemon(member_list[i].nodeid); } + + list_for_each_entry(node, &daemon_nodes, list) { + if (in_daemon_member_list(node->nodeid)) { + if (node->daemon_member) + continue; + + /* node joined daemon cpg */ + node->daemon_member = 1; + node->daemon_add_time = time(NULL); + } else { + if (!node->daemon_member) + continue; + + /* node left daemon cpg */ + node->daemon_member = 0; + node->killed = 0; + memset(&node->proto, 0, sizeof(struct protocol)); + node->daemon_rem_time = time(NULL); + } + } +} + +static void totem_cb_daemon(cpg_handle_t handle, + struct cpg_ring_id ring_id, + uint32_t member_list_entries, + const uint32_t *member_list) +{ + log_ringid("dlm:controld", &ring_id, member_list, member_list_entries); } -static cpg_callbacks_t cpg_callbacks_daemon = { +static cpg_model_v1_data_t cpg_callbacks_daemon = { .cpg_deliver_fn = deliver_cb_daemon, .cpg_confchg_fn = confchg_cb_daemon, + .cpg_totem_confchg_fn = totem_cb_daemon, + .flags = CPG_MODEL_V1_DELIVER_INITIAL_TOTEM_CONF, }; void process_cpg_daemon(int ci) @@ -2362,7 +2529,9 @@ int setup_cpg_daemon(void) our_protocol.kernel_max[1] = 1; our_protocol.kernel_max[2] = 1; - error = cpg_initialize(&cpg_handle_daemon, &cpg_callbacks_daemon); + error = cpg_model_initialize(&cpg_handle_daemon, CPG_MODEL_V1, + (cpg_model_data_t *)&cpg_callbacks_daemon, + NULL); if (error != CPG_OK) { log_error("daemon cpg_initialize error %d", error); return -1; @@ -2374,6 +2543,7 @@ int setup_cpg_daemon(void) sprintf(name.value, "dlm:controld"); name.length = strlen(name.value) + 1; + log_debug("cpg_join %s ...", name.value); retry: error = cpg_join(cpg_handle_daemon, &name); if (error == CPG_ERR_TRY_AGAIN) { @@ -2411,6 +2581,7 @@ void close_cpg_daemon(void) sprintf(name.value, "dlm:controld"); name.length = strlen(name.value) + 1; + log_debug("cpg_leave %s ...", name.value); retry: error = cpg_leave(cpg_handle_daemon, &name); if (error == CPG_ERR_TRY_AGAIN) { @@ -2509,13 +2680,15 @@ int set_lockspace_info(struct lockspace *ls, struct dlmc_lockspace *lockspace) lockspace->cg_next.seq = cg->seq; if (cg->state == CGST_WAIT_CONDITIONS) - lockspace->cg_next.wait_condition = 4; - if (poll_fencing) + lockspace->cg_next.wait_condition = 5; + if (poll_ringid) lockspace->cg_next.wait_condition = 1; - else if (poll_quorum) + else if (poll_fencing) lockspace->cg_next.wait_condition = 2; - else if (poll_fs) + else if (poll_quorum) lockspace->cg_next.wait_condition = 3; + else if (poll_fs) + lockspace->cg_next.wait_condition = 4; if (cg->state == CGST_WAIT_MESSAGES) lockspace->cg_next.wait_messages = 1; @@ -2550,8 +2723,6 @@ static int _set_node_info(struct lockspace *ls, struct change *cg, int nodeid, if (n->check_fencing) node->flags |= DLMC_NF_CHECK_FENCING; - if (n->check_quorum) - node->flags |= DLMC_NF_CHECK_QUORUM; if (n->check_fs) node->flags |= DLMC_NF_CHECK_FS; diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 27e5c01..61bd78d 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -118,6 +118,7 @@ EXTERN int daemon_debug_opt; EXTERN int daemon_quit; EXTERN int cluster_down; +EXTERN int poll_ringid; EXTERN int poll_fencing; EXTERN int poll_quorum; EXTERN int poll_fs; @@ -127,6 +128,7 @@ EXTERN int plock_fd; EXTERN int plock_ci; EXTERN struct list_head lockspaces; EXTERN int cluster_quorate; +EXTERN uint64_t quorate_time; EXTERN uint32_t cluster_ringid_seq; EXTERN int our_nodeid; EXTERN uint32_t control_minor; @@ -220,6 +222,7 @@ struct lockspace { /* lockspace membership stuff */ cpg_handle_t cpg_handle; + struct cpg_ring_id cpg_ringid; int cpg_client; int cpg_fd; int joining; @@ -242,7 +245,6 @@ struct lockspace { struct list_head saved_messages; struct list_head plock_resources; struct rb_root plock_resources_root; - time_t last_checkpoint_time; time_t last_plock_time; struct timeval drop_resources_last; diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index 279b707..ec005c3 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -49,6 +49,8 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, cs_error_t err; int i, j, num_addrs; + if (!cluster_quorate && quorate) + quorate_time = time(NULL); cluster_quorate = quorate; cluster_ringid_seq = (uint32_t)ring_seq;

1 0

dlm: master - dlm_controld: renaming things
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=90bf062ed3… Commit: 90bf062ed3f8d89f27046ef2c4216bd6e6cc9c49 Parent: 264d1b5ea71b3f23c3f249b25f7b19fb9397fb87 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 15:26:03 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 15:26:03 2011 -0500 dlm_controld: renaming things rename some functions and struct fields to clarify what they refer to Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 215 ++++++++++++++++++++++++++------------------ dlm_controld/dlm_daemon.h | 2 +- dlm_controld/member_cman.c | 2 +- 3 files changed, 128 insertions(+), 91 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 49f7d02..fa328d0 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -34,37 +34,46 @@ struct protocol { }; }; -struct member { +/* per dlm_controld cpg: daemon_nodes */ + +struct node_daemon { struct list_head list; int nodeid; - int start; /* 1 if we received a start message for this change */ - int added; /* 1 if added by this change */ - int failed; /* 1 if failed in this change */ - int disallowed; - uint32_t start_flags; + + struct protocol proto; }; +/* per lockspace cpg: ls->node_history */ + struct node { struct list_head list; int nodeid; + + uint64_t cluster_add_time; + uint64_t cluster_rem_time; + int cluster_member; + + uint64_t lockspace_add_time; + uint64_t lockspace_rem_time; + uint64_t lockspace_fail_time; + uint32_t lockspace_add_seq; + uint32_t lockspace_rem_seq; + int lockspace_member; + int lockspace_fail_reason; + + uint64_t start_time; + int check_fencing; int check_quorum; int check_fs; + int fs_notified; - uint64_t add_time; - uint64_t fail_time; + uint64_t fence_time; /* for debug */ - uint64_t cluster_add_time; - uint64_t cluster_remove_time; uint32_t fence_queries; /* for debug */ - uint32_t added_seq; /* for queries */ - uint32_t removed_seq; /* for queries */ - int failed_reason; /* for queries */ - - struct protocol proto; }; -/* One of these change structs is created for every confchg a cpg gets. */ +/* per lockspace confchg: ls->changes */ #define CGST_WAIT_CONDITIONS 1 #define CGST_WAIT_MESSAGES 2 @@ -84,6 +93,18 @@ struct change { uint64_t create_time; }; +/* per lockspace change member: cg->members */ + +struct member { + struct list_head list; + int nodeid; + int start; /* 1 if we received a start message for this change */ + int added; /* 1 if added by this change */ + int failed; /* 1 if failed in this change */ + int disallowed; + uint32_t start_flags; +}; + struct ls_info { uint32_t ls_info_size; uint32_t id_info_size; @@ -371,7 +392,7 @@ static void free_ls(struct lockspace *ls) For 1: - node X fails - - we see node X fail and X has non-zero add_time, + - we see node X fail and X has non-zero start_time, set check_fencing and record the fail time - wait for X to be removed from all dlm cpg's (probably not necessary) - check that the fencing time is later than the recorded time above @@ -387,15 +408,15 @@ static void free_ls(struct lockspace *ls) continue running properly once the remerged node is properly reset ls->node_history - when we see a node not in this list, add entry for it with zero add_time - record the time we get a good start message from the node, add_time - clear add_time if the node leaves - if node fails with non-zero add_time, set check_fencing - when a node is fenced, clear add_time and clear check_fencing - if a node remerges after this, no good start message, no new add_time set - if a node fails with zero add_time, it doesn't need fencing + when we see a node not in this list, add entry for it with zero start_time + record the time we get a good start message from the node, start_time + clear start_time if the node leaves + if node fails with non-zero start_time, set check_fencing + when a node is fenced, clear start_time and clear check_fencing + if a node remerges after this, no good start message, no new start_time set + if a node fails with zero start_time, it doesn't need fencing if a node remerges before it's been fenced, no good start message, no new - add_time set + start_time set */ static struct node *get_node_history(struct lockspace *ls, int nodeid) @@ -409,26 +430,22 @@ static struct node *get_node_history(struct lockspace *ls, int nodeid) return NULL; } -static void node_history_init(struct lockspace *ls, int nodeid, - struct change *cg) +static struct node *get_node_history_create(struct lockspace *ls, int nodeid) { struct node *node; node = get_node_history(ls, nodeid); if (node) - goto out; + return node; node = malloc(sizeof(struct node)); if (!node) - return; + return NULL; memset(node, 0, sizeof(struct node)); node->nodeid = nodeid; - node->add_time = 0; list_add_tail(&node->list, &ls->node_history); - out: - if (cg) - node->added_seq = cg->seq; /* for queries */ + return node; } void node_history_cluster_add(int nodeid) @@ -437,20 +454,17 @@ void node_history_cluster_add(int nodeid) struct node *node; list_for_each_entry(ls, &lockspaces, list) { - node_history_init(ls, nodeid, NULL); - - node = get_node_history(ls, nodeid); + node = get_node_history_create(ls, nodeid); if (!node) { - log_error("node_history_cluster_add no nodeid %d", - nodeid); + log_error("node_history_cluster_add no nodeid %d", nodeid); return; } - node->cluster_add_time = time(NULL); + node->cluster_member = 1; } } -void node_history_cluster_remove(int nodeid) +void node_history_cluster_rem(int nodeid) { struct lockspace *ls; struct node *node; @@ -458,59 +472,63 @@ void node_history_cluster_remove(int nodeid) list_for_each_entry(ls, &lockspaces, list) { node = get_node_history(ls, nodeid); if (!node) { - log_error("node_history_cluster_remove no nodeid %d", - nodeid); + log_error("node_history_cluster_rem no nodeid %d", nodeid); return; } - - node->cluster_remove_time = time(NULL); + node->cluster_rem_time = time(NULL); + node->cluster_member = 0; } } -static void node_history_start(struct lockspace *ls, int nodeid) +static void node_history_lockspace_add(struct lockspace *ls, int nodeid, + struct change *cg) { struct node *node; - - node = get_node_history(ls, nodeid); + + node = get_node_history_create(ls, nodeid); if (!node) { - log_error("node_history_start no nodeid %d", nodeid); + log_error("node_history_lockspace_add no nodeid %d", nodeid); return; } - node->add_time = time(NULL); + node->lockspace_add_time = time(NULL); + node->lockspace_add_seq = cg->seq; + node->lockspace_member = 1; } -static void node_history_left(struct lockspace *ls, int nodeid, - struct change *cg) +static void node_history_lockspace_left(struct lockspace *ls, int nodeid, + struct change *cg) { struct node *node; node = get_node_history(ls, nodeid); if (!node) { - log_error("node_history_left no nodeid %d", nodeid); + log_error("node_history_lockspace_left no nodeid %d", nodeid); return; } - node->add_time = 0; - node->removed_seq = cg->seq; /* for queries */ + node->start_time = 0; + + node->lockspace_rem_time = time(NULL); + node->lockspace_rem_seq = cg->seq; /* for queries */ + node->lockspace_member = 0; } -static void node_history_fail(struct lockspace *ls, int nodeid, - struct change *cg, int reason) +static void node_history_lockspace_fail(struct lockspace *ls, int nodeid, + struct change *cg, int reason) { struct node *node; node = get_node_history(ls, nodeid); if (!node) { - log_error("node_history_fail no nodeid %d", nodeid); + log_error("node_history_lockspace_fail no nodeid %d", nodeid); return; } - if (cfgd_enable_fencing && node->add_time) { + if (cfgd_enable_fencing && node->start_time) { node->check_fencing = 1; node->fence_time = 0; node->fence_queries = 0; - node->fail_time = time(NULL); } /* fenced will take care of making sure the quorum value @@ -524,8 +542,24 @@ static void node_history_fail(struct lockspace *ls, int nodeid, node->check_fs = 1; } - node->removed_seq = cg->seq; /* for queries */ - node->failed_reason = reason; /* for queries */ + node->lockspace_rem_time = time(NULL); + node->lockspace_rem_seq = cg->seq; /* for queries */ + node->lockspace_member = 0; + node->lockspace_fail_reason = reason; /* for queries */ + node->lockspace_fail_time = node->lockspace_rem_time; +} + +static void node_history_start(struct lockspace *ls, int nodeid) +{ + struct node *node; + + node = get_node_history(ls, nodeid); + if (!node) { + log_error("node_history_start no nodeid %d", nodeid); + return; + } + + node->start_time = time(NULL); } static int check_fencing_done(struct lockspace *ls) @@ -545,7 +579,7 @@ static int check_fencing_done(struct lockspace *ls) continue; /* check with fenced to see if the node has been - fenced since node->add_time */ + fenced since node->start_time */ rv = fence_node_time(node->nodeid, &last_fenced_time); if (rv < 0) @@ -555,24 +589,24 @@ static int check_fencing_done(struct lockspace *ls) we've seen fenced_time within the same second as fail_time: with external fencing, e.g. fence_node */ - if (last_fenced_time >= node->fail_time) { + if (last_fenced_time >= node->lockspace_fail_time) { log_group(ls, "check_fencing %d done " - "add %llu fail %llu last %llu", + "start %llu fail %llu last %llu", node->nodeid, - (unsigned long long)node->add_time, - (unsigned long long)node->fail_time, + (unsigned long long)node->start_time, + (unsigned long long)node->lockspace_fail_time, (unsigned long long)last_fenced_time); node->check_fencing = 0; - node->add_time = 0; + node->start_time = 0; node->fence_time = last_fenced_time; } else { if (!node->fence_queries || node->fence_time != last_fenced_time) { log_group(ls, "check_fencing %d wait " - "add %llu fail %llu last %llu", + "start %llu fail %llu last %llu", node->nodeid, - (unsigned long long)node->add_time, - (unsigned long long)node->fail_time, + (unsigned long long)node->start_time, + (unsigned long long)node->lockspace_fail_time, (unsigned long long)last_fenced_time); node->fence_queries++; node->fence_time = last_fenced_time; @@ -1415,11 +1449,12 @@ static int add_change(struct lockspace *ls, } list_add_tail(&memb->list, &cg->removed); - if (memb->failed) - node_history_fail(ls, memb->nodeid, cg, - left_list[i].reason); - else - node_history_left(ls, memb->nodeid, cg); + if (memb->failed) { + node_history_lockspace_fail(ls, memb->nodeid, cg, + left_list[i].reason); + } else { + node_history_lockspace_left(ls, memb->nodeid, cg); + } log_group(ls, "add_change cg %u remove nodeid %d reason %d", cg->seq, memb->nodeid, left_list[i].reason); @@ -1437,10 +1472,11 @@ static int add_change(struct lockspace *ls, } memb->added = 1; - if (memb->nodeid == our_nodeid) + if (memb->nodeid == our_nodeid) { cg->we_joined = 1; - else - node_history_init(ls, memb->nodeid, cg); + } else { + node_history_lockspace_add(ls, memb->nodeid, cg); + } log_group(ls, "add_change cg %u joined nodeid %d", cg->seq, memb->nodeid); @@ -1448,8 +1484,9 @@ static int add_change(struct lockspace *ls, if (cg->we_joined) { log_group(ls, "add_change cg %u we joined", cg->seq); - list_for_each_entry(memb, &cg->members, list) - node_history_init(ls, memb->nodeid, cg); + list_for_each_entry(memb, &cg->members, list) { + node_history_lockspace_add(ls, memb->nodeid, cg); + } } log_group(ls, "add_change cg %u counts member %d joined %d remove %d " @@ -1879,9 +1916,9 @@ int dlm_leave_lockspace(struct lockspace *ls) return 0; } -static struct node *get_node_daemon(int nodeid) +static struct node_daemon *get_node_daemon(int nodeid) { - struct node *node; + struct node_daemon *node; list_for_each_entry(node, &daemon_nodes, list) { if (node->nodeid == nodeid) @@ -1892,7 +1929,7 @@ static struct node *get_node_daemon(int nodeid) static void add_node_daemon(int nodeid) { - struct node *node; + struct node_daemon *node; if (get_node_daemon(nodeid)) return; @@ -1944,7 +1981,7 @@ static void protocol_out(struct protocol *proto) static int all_protocol_messages(void) { - struct node *node; + struct node_daemon *node; int i; if (!daemon_member_count) @@ -1968,7 +2005,7 @@ static int pick_min_protocol(struct protocol *proto) { uint16_t mind[4]; uint16_t mink[4]; - struct node *node; + struct node_daemon *node; int i; memset(&mind, 0, sizeof(mind)); @@ -2052,7 +2089,7 @@ static int pick_min_protocol(struct protocol *proto) static void receive_protocol(struct dlm_header *hd, int len) { struct protocol *p; - struct node *node; + struct node_daemon *node; p = (struct protocol *)((char *)hd + sizeof(struct dlm_header)); protocol_in(p); @@ -2518,9 +2555,9 @@ static int _set_node_info(struct lockspace *ls, struct change *cg, int nodeid, if (n->check_fs) node->flags |= DLMC_NF_CHECK_FS; - node->added_seq = n->added_seq; - node->removed_seq = n->removed_seq; - node->failed_reason = n->failed_reason; + node->added_seq = n->lockspace_add_seq; + node->removed_seq = n->lockspace_rem_seq; + node->failed_reason = n->lockspace_fail_reason; out: return 0; } diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 6f70a17..27e5c01 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -293,7 +293,7 @@ int dlm_leave_lockspace(struct lockspace *ls); const char *msg_name(int type); void update_flow_control_status(void); void node_history_cluster_add(int nodeid); -void node_history_cluster_remove(int nodeid); +void node_history_cluster_rem(int nodeid); int set_node_info(struct lockspace *ls, int nodeid, struct dlmc_node *node); int set_lockspace_info(struct lockspace *ls, struct dlmc_lockspace *lockspace); int set_lockspaces(int *count, struct dlmc_lockspace **lss_out); diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index 41af911..279b707 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -69,7 +69,7 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, if (!is_cluster_member(old_nodes[i])) { log_debug("cluster node %u removed seq %u", old_nodes[i], cluster_ringid_seq); - node_history_cluster_remove(old_nodes[i]); + node_history_cluster_rem(old_nodes[i]); del_configfs_node(old_nodes[i]); } }

1 0

dlm: master - dlm_tool: remove unused line
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=264d1b5ea7… Commit: 264d1b5ea71b3f23c3f249b25f7b19fb9397fb87 Parent: 079325c492e5a5a8c43111fe30f0c09fc6f1019f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 13:08:30 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 13:08:30 2011 -0500 dlm_tool: remove unused line Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_tool/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlm_tool/main.c b/dlm_tool/main.c index 3523cce..776aa64 100644 --- a/dlm_tool/main.c +++ b/dlm_tool/main.c @@ -53,8 +53,6 @@ static int verbose; static int wide; static int summarize; -#define VERSION "master" - #define MAX_LS 128 #define MAX_NODES 128

1 0

dlm: master - dlm_controld: remove /dev/misc/lock_dlm_plock
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=079325c492… Commit: 079325c492e5a5a8c43111fe30f0c09fc6f1019f Parent: 91ba7d83c9468ca3d9c1ca5e65e45347c1d9160b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 12:19:34 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 12:19:34 2011 -0500 dlm_controld: remove /dev/misc/lock_dlm_plock compat code which was replaced by dlm_plock Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/action.c | 125 --------------------------------------------- dlm_controld/dlm_daemon.h | 3 - dlm_controld/plock.c | 41 --------------- 3 files changed, 0 insertions(+), 169 deletions(-) diff --git a/dlm_controld/action.c b/dlm_controld/action.c index 237221a..78500dd 100644 --- a/dlm_controld/action.c +++ b/dlm_controld/action.c @@ -15,7 +15,6 @@ static int dir_members[MAX_NODES]; static int dir_members_count; static int comms_nodes[MAX_NODES]; static int comms_nodes_count; -static char mg_name[DLM_LOCKSPACE_LEN+1]; #define DLM_SYSFS_DIR "/sys/kernel/dlm" #define CLUSTER_DIR "/sys/kernel/config/dlm/cluster" @@ -74,87 +73,6 @@ static int detect_protocol(void) return proto; } -/* look for an id that matches in e.g. /sys/fs/gfs/bull\:x/lock_module/id - and then extract the "x" as the name */ - -static int get_mountgroup_name(uint32_t mg_id) -{ - char path[PATH_MAX]; - char *fsname; - const char *fsdir; - DIR *d; - FILE *file; - struct dirent *de; - uint32_t id; - int retry_gfs2 = 1; - int rv, error; - - fsdir = "/sys/fs/gfs"; - retry: - rv = -1; - - d = opendir(fsdir); - if (!d) { - log_debug("%s: opendir failed: %d", path, errno); - goto out; - } - - while ((de = readdir(d))) { - if (de->d_name[0] == '.') - continue; - - id = 0; - memset(path, 0, PATH_MAX); - snprintf(path, PATH_MAX, "%s/%s/lock_module/id", - fsdir, de->d_name); - - file = fopen(path, "r"); - if (!file) { - log_error("can't open %s %d", path, errno); - continue; - } - - error = fscanf(file, "%u", &id); - fclose(file); - - if (error != 1) { - log_error("bad read %s %d", path, errno); - continue; - } - if (id != mg_id) { - log_debug("get_mountgroup_name skip %x %s", - id, de->d_name); - continue; - } - - /* take the fsname out of clustername:fsname */ - fsname = strstr(de->d_name, ":"); - if (!fsname) { - log_debug("get_mountgroup_name skip2 %x %s", - id, de->d_name); - continue; - } - fsname++; - - log_debug("get_mountgroup_name found %x %s %s", - id, de->d_name, fsname); - strncpy(mg_name, fsname, sizeof(mg_name)); - rv = 0; - break; - } - - closedir(d); - - out: - if (rv && retry_gfs2) { - retry_gfs2 = 0; - fsdir = "/sys/fs/gfs2"; - goto retry; - } - - return rv; -} - /* This is for the case where dlm_controld exits/fails, abandoning dlm lockspaces in the kernel, and then dlm_controld is restarted. When dlm_controld exits and abandons lockspaces, that node needs to be @@ -186,36 +104,6 @@ int check_uncontrolled_lockspaces(void) return 0; } -/* find the mountgroup with "mg_id" in sysfs, get it's name, then look for - the ls with with the same name in lockspaces list, return its id */ - -void set_associated_id(uint32_t mg_id) -{ - struct lockspace *ls; - int rv; - - log_debug("set_associated_id mg_id %x %d", mg_id, mg_id); - - memset(&mg_name, 0, sizeof(mg_name)); - - rv = get_mountgroup_name(mg_id); - if (rv) { - log_error("no mountgroup found with id %x", mg_id); - return; - } - - ls = find_ls(mg_name); - if (!ls) { - log_error("no lockspace found with name %s for mg_id %x", - mg_name, mg_id); - return; - } - - log_debug("set_associated_id mg %x is ls %x", mg_id, ls->global_id); - - ls->associated_mg_id = mg_id; -} - static int do_sysfs(const char *name, const char *file, char *val) { char fname[512]; @@ -996,7 +884,6 @@ static void find_minors(void) control_minor = 0; monitor_minor = 0; plock_minor = 0; - old_plock_minor = 0; if (!(fl = fopen("/proc/misc", "r"))) { log_error("/proc/misc fopen failed: %s", strerror(errno)); @@ -1015,9 +902,6 @@ static void find_minors(void) } else if (!strcmp(name, "dlm_plock")) { plock_minor = number; found++; - } else if (!strcmp(name, "lock_dlm_plock")) { - old_plock_minor = number; - found++; } } else do { @@ -1078,15 +962,6 @@ int setup_misc_devices(void) plock_minor); } - if (!plock_minor && old_plock_minor) { - rv = find_udev_device("/dev/misc/lock_dlm_plock", - old_plock_minor); - if (rv < 0) - return rv; - log_debug("found /dev/misc/lock_dlm_plock minor %u", - old_plock_minor); - } - return 0; } diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 27c9d7a..6f70a17 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -132,7 +132,6 @@ EXTERN int our_nodeid; EXTERN uint32_t control_minor; EXTERN uint32_t monitor_minor; EXTERN uint32_t plock_minor; -EXTERN uint32_t old_plock_minor; EXTERN int optk_debug; EXTERN int optk_timewarn; @@ -240,7 +239,6 @@ struct lockspace { int save_plocks; int disable_plock; uint32_t recv_plocks_data_count; - uint32_t associated_mg_id; struct list_head saved_messages; struct list_head plock_resources; struct rb_root plock_resources_root; @@ -266,7 +264,6 @@ struct lockspace { }; /* action.c */ -void set_associated_id(uint32_t mg_id); int set_sysfs_control(char *name, int val); int set_sysfs_event_done(char *name, int val); int set_sysfs_id(char *name, uint32_t id); diff --git a/dlm_controld/plock.c b/dlm_controld/plock.c index 4b66904..d475cf4 100644 --- a/dlm_controld/plock.c +++ b/dlm_controld/plock.c @@ -26,7 +26,6 @@ static struct timeval plock_recv_time; static struct timeval plock_rate_last; static int plock_device_fd = -1; -static int need_fsid_translation = 0; extern int message_flow_control_on; @@ -163,13 +162,6 @@ static const char *ex_str(int optype, int ex) return "RD"; } -/* - * In kernels before 2.6.26, plocks came from gfs2's lock_dlm module. - * Reading plocks from there as well should allow us to use cluster3 - * on old (RHEL5) kernels. In this case, the fsid we read in plock_info - * structs is the mountgroup id, which we need to translate to the ls id. - */ - int setup_plocks(void) { plock_read_count = 0; @@ -181,10 +173,6 @@ int setup_plocks(void) if (plock_minor) { plock_device_fd = open("/dev/misc/dlm_plock", O_RDWR); - } else if (old_plock_minor) { - log_debug("setup_plocks using old lock_dlm interface"); - need_fsid_translation = 1; - plock_device_fd = open("/dev/misc/lock_dlm_plock", O_RDWR); } if (plock_device_fd < 0) { @@ -193,9 +181,6 @@ int setup_plocks(void) } log_debug("plocks %d", plock_device_fd); - log_debug("plock cpg message size: %u bytes", - (unsigned int) (sizeof(struct dlm_header) + - sizeof(struct dlm_plock_info))); return plock_device_fd; } @@ -206,26 +191,6 @@ void close_plocks(void) close(plock_device_fd); } -static uint32_t mg_to_ls_id(uint32_t fsid) -{ - struct lockspace *ls; - int do_set = 1; - - retry: - list_for_each_entry(ls, &lockspaces, list) { - if (ls->associated_mg_id == fsid) - return ls->global_id; - } - - if (do_set) { - do_set = 0; - set_associated_id(fsid); - goto retry; - } - - return fsid; -} - /* FIXME: unify these two */ static unsigned long time_diff_ms(struct timeval *begin, struct timeval *end) @@ -724,9 +689,6 @@ static int add_waiter(struct lockspace *ls, struct resource *r, static void write_result(struct lockspace *ls, struct dlm_plock_info *in, int rv) { - if (need_fsid_translation) - in->fsid = ls->associated_mg_id; - in->rv = rv; write(plock_device_fd, in, sizeof(struct dlm_plock_info)); } @@ -1582,9 +1544,6 @@ void process_plocks(int ci) goto fail; } - if (need_fsid_translation) - info.fsid = mg_to_ls_id(info.fsid); - ls = find_ls_id(info.fsid); if (!ls) { log_plock(ls, "process_plocks: no ls id %x", info.fsid);

1 0

dlm: master - add license/copyright headers
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=91ba7d83c9… Commit: 91ba7d83c9468ca3d9c1ca5e65e45347c1d9160b Parent: 7ca6817d7a4dad7c4d96c41ad548ceccbd167e48 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 12:07:45 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 12:07:45 2011 -0500 add license/copyright headers Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/action.c | 8 ++++++++ dlm_controld/config.c | 8 ++++++++ dlm_controld/cpg.c | 8 ++++++++ dlm_controld/crc.c | 8 ++++++++ dlm_controld/deadlock.c | 8 ++++++++ dlm_controld/dlm_controld.h | 8 ++++++++ dlm_controld/dlm_daemon.h | 8 ++++++++ dlm_controld/lib.c | 8 ++++++++ dlm_controld/libdlmcontrol.h | 8 ++++++++ dlm_controld/linux_endian.h | 8 ++++++++ dlm_controld/logging.c | 8 ++++++++ dlm_controld/main.c | 8 ++++++++ dlm_controld/member_cman.c | 8 ++++++++ dlm_controld/netlink.c | 8 ++++++++ dlm_controld/plock.c | 8 ++++++++ dlm_tool/main.c | 8 ++++++++ libdlm/libdlm.c | 9 +++++++++ libdlm/libdlm.h | 9 +++++++++ libdlm/libdlm_internal.h | 8 ++++++++ 19 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlm_controld/action.c b/dlm_controld/action.c index e9148a1..237221a 100644 --- a/dlm_controld/action.c +++ b/dlm_controld/action.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include <corosync/corotypes.h> diff --git a/dlm_controld/config.c b/dlm_controld/config.c index 6c94fca..7ceea6a 100644 --- a/dlm_controld/config.c +++ b/dlm_controld/config.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include <libxml/tree.h> diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index b3c1454..49f7d02 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" struct protocol_version { diff --git a/dlm_controld/crc.c b/dlm_controld/crc.c index ff8c1d3..1764850 100644 --- a/dlm_controld/crc.c +++ b/dlm_controld/crc.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" static const uint32_t crc_32_tab[] = { diff --git a/dlm_controld/deadlock.c b/dlm_controld/deadlock.c index 6aaabc5..9a7fd5d 100644 --- a/dlm_controld/deadlock.c +++ b/dlm_controld/deadlock.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include "libdlm.h" diff --git a/dlm_controld/dlm_controld.h b/dlm_controld/dlm_controld.h index 73e4ecc..a802882 100644 --- a/dlm_controld/dlm_controld.h +++ b/dlm_controld/dlm_controld.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #ifndef __DLM_CONTROLD_DOT_H__ #define __DLM_CONTROLD_DOT_H__ diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index d0975af..27c9d7a 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #ifndef __DLM_DAEMON_DOT_H__ #define __DLM_DAEMON_DOT_H__ diff --git a/dlm_controld/lib.c b/dlm_controld/lib.c index e714ff9..311b6e9 100644 --- a/dlm_controld/lib.c +++ b/dlm_controld/lib.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/dlm_controld/libdlmcontrol.h b/dlm_controld/libdlmcontrol.h index 64a3814..5a9404f 100644 --- a/dlm_controld/libdlmcontrol.h +++ b/dlm_controld/libdlmcontrol.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #ifndef _LIBDLMCONTROL_H_ #define _LIBDLMCONTROL_H_ diff --git a/dlm_controld/linux_endian.h b/dlm_controld/linux_endian.h index 43089d2..8736b5b 100644 --- a/dlm_controld/linux_endian.h +++ b/dlm_controld/linux_endian.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #ifndef __LINUX_ENDIAN_DOT_H__ #define __LINUX_ENDIAN_DOT_H__ diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c index bf1a0eb..803d08a 100644 --- a/dlm_controld/logging.c +++ b/dlm_controld/logging.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" static int syslog_facility; diff --git a/dlm_controld/main.c b/dlm_controld/main.c index a931aa6..822a6a5 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #define EXTERN #include "dlm_daemon.h" #include <pthread.h> diff --git a/dlm_controld/member_cman.c b/dlm_controld/member_cman.c index 909c249..41af911 100644 --- a/dlm_controld/member_cman.c +++ b/dlm_controld/member_cman.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include <corosync/corotypes.h> #include <corosync/cfg.h> diff --git a/dlm_controld/netlink.c b/dlm_controld/netlink.c index 9f1d382..06b6312 100644 --- a/dlm_controld/netlink.c +++ b/dlm_controld/netlink.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include <linux/dlm.h> #include <linux/netlink.h> diff --git a/dlm_controld/plock.c b/dlm_controld/plock.c index c38b998..4b66904 100644 --- a/dlm_controld/plock.c +++ b/dlm_controld/plock.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include "dlm_daemon.h" #include <linux/dlm_plock.h> diff --git a/dlm_tool/main.c b/dlm_tool/main.c index 55593c0..3523cce 100644 --- a/dlm_tool/main.c +++ b/dlm_tool/main.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + */ + #include <unistd.h> #include <stdio.h> #include <stdint.h> diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c index a5157e2..134f5a7 100644 --- a/libdlm/libdlm.c +++ b/libdlm/libdlm.c @@ -1,3 +1,12 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + */ + #ifdef _REENTRANT #include <pthread.h> #endif diff --git a/libdlm/libdlm.h b/libdlm/libdlm.h index 17a552c..6a30407 100644 --- a/libdlm/libdlm.h +++ b/libdlm/libdlm.h @@ -1,3 +1,12 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + */ + #ifndef __LIBDLM_H #define __LIBDLM_H diff --git a/libdlm/libdlm_internal.h b/libdlm/libdlm_internal.h index c8b270e..c8fded7 100644 --- a/libdlm/libdlm_internal.h +++ b/libdlm/libdlm_internal.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + */ /* Needed before we include the kernel libdlm header */ #define __user

1 0

dlm: master - dlm_controld: use EXTERN
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=7ca6817d7a… Commit: 7ca6817d7a4dad7c4d96c41ad548ceccbd167e48 Parent: 43931c355acc80658345a73c78ca866016938d32 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 11:44:06 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 11:44:06 2011 -0500 dlm_controld: use EXTERN to clean up declarations Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/config.h | 47 ------------------------ dlm_controld/deadlock.c | 1 - dlm_controld/dlm_daemon.h | 86 ++++++++++++++++++++++++++++++++++----------- dlm_controld/main.c | 68 ++++++++--------------------------- dlm_controld/netlink.c | 1 - 5 files changed, 80 insertions(+), 123 deletions(-) diff --git a/dlm_controld/config.h b/dlm_controld/config.h deleted file mode 100644 index ab37eed..0000000 --- a/dlm_controld/config.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef __CONFIG_DOT_H__ -#define __CONFIG_DOT_H__ - -/* the kernel has default values for debug, timewarn and protocol; - we only change them if new values are given on command line or in ccs */ - -#define DEFAULT_DEBUG_LOGFILE 0 -#define DEFAULT_ENABLE_FENCING 1 -#define DEFAULT_ENABLE_QUORUM 0 -#define DEFAULT_ENABLE_PLOCK 1 -#define DEFAULT_PLOCK_DEBUG 0 -#define DEFAULT_PLOCK_RATE_LIMIT 0 -#define DEFAULT_PLOCK_OWNERSHIP 0 -#define DEFAULT_DROP_RESOURCES_TIME 10000 /* 10 sec */ -#define DEFAULT_DROP_RESOURCES_COUNT 10 -#define DEFAULT_DROP_RESOURCES_AGE 10000 /* 10 sec */ - -extern int optk_debug; -extern int optk_timewarn; -extern int optk_protocol; -extern int optd_debug_logfile; -extern int optd_enable_fencing; -extern int optd_enable_quorum; -extern int optd_enable_plock; -extern int optd_plock_debug; -extern int optd_plock_rate_limit; -extern int optd_plock_ownership; -extern int optd_drop_resources_time; -extern int optd_drop_resources_count; -extern int optd_drop_resources_age; - -extern int cfgk_debug; -extern int cfgk_timewarn; -extern int cfgk_protocol; -extern int cfgd_debug_logfile; -extern int cfgd_enable_fencing; -extern int cfgd_enable_quorum; -extern int cfgd_enable_plock; -extern int cfgd_plock_debug; -extern int cfgd_plock_rate_limit; -extern int cfgd_plock_ownership; -extern int cfgd_drop_resources_time; -extern int cfgd_drop_resources_count; -extern int cfgd_drop_resources_age; - -#endif - diff --git a/dlm_controld/deadlock.c b/dlm_controld/deadlock.c index bd1d68c..6aaabc5 100644 --- a/dlm_controld/deadlock.c +++ b/dlm_controld/deadlock.c @@ -1,5 +1,4 @@ #include "dlm_daemon.h" -#include "config.h" #include "libdlm.h" static SaCkptHandleT global_ckpt_h; diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 5d12296..d0975af 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -38,11 +38,19 @@ #include <linux/dlmconstants.h> #include "libdlmcontrol.h" #include "dlm_controld.h" -#include "config.h" #include "list.h" #include "rbtree.h" #include "linux_endian.h" +#ifndef EXTERN +#define EXTERN extern +#else +#undef EXTERN +#define EXTERN +#endif + +#define DAEMON_NAME "dlm_controld" + /* TODO: get CONFDIR, LOGDIR, RUNDIR from build */ #define RUNDIR "/var/run/cluster" @@ -63,8 +71,16 @@ #define DEFAULT_LOGFILE_PRIORITY LOG_INFO #define DEFAULT_LOGFILE LOG_FILE_PATH -#define DAEMON_NAME "dlm_controld" - +#define DEFAULT_DEBUG_LOGFILE 0 +#define DEFAULT_ENABLE_FENCING 1 +#define DEFAULT_ENABLE_QUORUM 0 +#define DEFAULT_ENABLE_PLOCK 1 +#define DEFAULT_PLOCK_DEBUG 0 +#define DEFAULT_PLOCK_RATE_LIMIT 0 +#define DEFAULT_PLOCK_OWNERSHIP 0 +#define DEFAULT_DROP_RESOURCES_TIME 10000 /* 10 sec */ +#define DEFAULT_DROP_RESOURCES_COUNT 10 +#define DEFAULT_DROP_RESOURCES_AGE 10000 /* 10 sec */ /* DLM_LOCKSPACE_LEN: maximum lockspace name length, from linux/dlmconstants.h. Copied in libdlm.h so apps don't need to include the kernel header. @@ -91,24 +107,52 @@ #define PROTO_SCTP 1 #define PROTO_DETECT 2 -extern int daemon_debug_opt; -extern int daemon_quit; -extern int cluster_down; -extern int poll_fencing; -extern int poll_quorum; -extern int poll_fs; -extern int poll_ignore_plock; -extern int poll_drop_plock; -extern int plock_fd; -extern int plock_ci; -extern struct list_head lockspaces; -extern int cluster_quorate; -extern uint32_t cluster_ringid_seq; -extern int our_nodeid; -extern uint32_t control_minor; -extern uint32_t monitor_minor; -extern uint32_t plock_minor; -extern uint32_t old_plock_minor; +EXTERN int daemon_debug_opt; +EXTERN int daemon_quit; +EXTERN int cluster_down; +EXTERN int poll_fencing; +EXTERN int poll_quorum; +EXTERN int poll_fs; +EXTERN int poll_ignore_plock; +EXTERN int poll_drop_plock; +EXTERN int plock_fd; +EXTERN int plock_ci; +EXTERN struct list_head lockspaces; +EXTERN int cluster_quorate; +EXTERN uint32_t cluster_ringid_seq; +EXTERN int our_nodeid; +EXTERN uint32_t control_minor; +EXTERN uint32_t monitor_minor; +EXTERN uint32_t plock_minor; +EXTERN uint32_t old_plock_minor; + +EXTERN int optk_debug; +EXTERN int optk_timewarn; +EXTERN int optk_protocol; +EXTERN int optd_debug_logfile; +EXTERN int optd_enable_fencing; +EXTERN int optd_enable_quorum; +EXTERN int optd_enable_plock; +EXTERN int optd_plock_debug; +EXTERN int optd_plock_rate_limit; +EXTERN int optd_plock_ownership; +EXTERN int optd_drop_resources_time; +EXTERN int optd_drop_resources_count; +EXTERN int optd_drop_resources_age; + +EXTERN int cfgk_debug; +EXTERN int cfgk_timewarn; +EXTERN int cfgk_protocol; +EXTERN int cfgd_debug_logfile; +EXTERN int cfgd_enable_fencing; +EXTERN int cfgd_enable_quorum; +EXTERN int cfgd_enable_plock; +EXTERN int cfgd_plock_debug; +EXTERN int cfgd_plock_rate_limit; +EXTERN int cfgd_plock_ownership; +EXTERN int cfgd_drop_resources_time; +EXTERN int cfgd_drop_resources_count; +EXTERN int cfgd_drop_resources_age; #define LOG_DUMP_SIZE DLMC_DUMP_SIZE diff --git a/dlm_controld/main.c b/dlm_controld/main.c index e940fc0..a931aa6 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -1,3 +1,4 @@ +#define EXTERN #include "dlm_daemon.h" #include <pthread.h> #include <linux/netlink.h> @@ -1234,6 +1235,20 @@ int main(int argc, char **argv) { int fd; + cfgk_debug = -1; + cfgk_timewarn = -1; + cfgk_protocol = PROTO_DETECT; + cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; + cfgd_enable_fencing = DEFAULT_ENABLE_FENCING; + cfgd_enable_quorum = DEFAULT_ENABLE_QUORUM; + cfgd_enable_plock = DEFAULT_ENABLE_PLOCK; + cfgd_plock_debug = DEFAULT_PLOCK_DEBUG; + cfgd_plock_rate_limit = DEFAULT_PLOCK_RATE_LIMIT; + cfgd_plock_ownership = DEFAULT_PLOCK_OWNERSHIP; + cfgd_drop_resources_time = DEFAULT_DROP_RESOURCES_TIME; + cfgd_drop_resources_count = DEFAULT_DROP_RESOURCES_COUNT; + cfgd_drop_resources_age = DEFAULT_DROP_RESOURCES_AGE; + INIT_LIST_HEAD(&lockspaces); INIT_LIST_HEAD(&fs_register_list); @@ -1264,56 +1279,3 @@ int main(int argc, char **argv) return 0; } -int daemon_debug_opt; -int daemon_quit; -int cluster_down; -int poll_fencing; -int poll_quorum; -int poll_fs; -int poll_ignore_plock; -int poll_drop_plock; -int plock_fd; -int plock_ci; -struct list_head lockspaces; -int cluster_quorate; -int our_nodeid; -uint32_t cluster_ringid_seq; -uint32_t control_minor; -uint32_t monitor_minor; -uint32_t plock_minor; -uint32_t old_plock_minor; - -/* was a config value set on command line?, 0 or 1. - optk is a kernel option, optd is a daemon option */ - -int optk_debug; -int optk_timewarn; -int optk_protocol; -int optd_debug_logfile; -int optd_enable_fencing; -int optd_enable_quorum; -int optd_enable_plock; -int optd_plock_debug; -int optd_plock_rate_limit; -int optd_plock_ownership; -int optd_drop_resources_time; -int optd_drop_resources_count; -int optd_drop_resources_age; - -/* actual config value from command line, cluster.conf, or default. - cfgk is a kernel config value, cfgd is a daemon config value */ - -int cfgk_debug = -1; -int cfgk_timewarn = -1; -int cfgk_protocol = PROTO_DETECT; -int cfgd_debug_logfile = DEFAULT_DEBUG_LOGFILE; -int cfgd_enable_fencing = DEFAULT_ENABLE_FENCING; -int cfgd_enable_quorum = DEFAULT_ENABLE_QUORUM; -int cfgd_enable_plock = DEFAULT_ENABLE_PLOCK; -int cfgd_plock_debug = DEFAULT_PLOCK_DEBUG; -int cfgd_plock_rate_limit = DEFAULT_PLOCK_RATE_LIMIT; -int cfgd_plock_ownership = DEFAULT_PLOCK_OWNERSHIP; -int cfgd_drop_resources_time = DEFAULT_DROP_RESOURCES_TIME; -int cfgd_drop_resources_count = DEFAULT_DROP_RESOURCES_COUNT; -int cfgd_drop_resources_age = DEFAULT_DROP_RESOURCES_AGE; - diff --git a/dlm_controld/netlink.c b/dlm_controld/netlink.c index 63122f7..9f1d382 100644 --- a/dlm_controld/netlink.c +++ b/dlm_controld/netlink.c @@ -1,5 +1,4 @@ #include "dlm_daemon.h" -#include "config.h" #include <linux/dlm.h> #include <linux/netlink.h> #include <linux/genetlink.h>

1 0

dlm: master - dlm_controld: update logging
by David Teigland 06 Oct '11

06 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=43931c355a… Commit: 43931c355acc80658345a73c78ca866016938d32 Parent: 9a6125969490e49cd843b02feb23de1fc53c94ad Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Oct 6 11:31:33 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Oct 6 11:31:33 2011 -0500 dlm_controld: update logging don't bother logging from thread, other cleanups Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/Makefile | 2 +- dlm_controld/dlm_daemon.h | 2 +- dlm_controld/logging.c | 54 ++++++++++++++++++++------------------------- dlm_controld/main.c | 18 ++++++++++++-- 4 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index 25b1ea4..7bd37a1 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -61,7 +61,7 @@ BIN_CFLAGS += -I../include -I../libdlm BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie BIN_LDFLAGS += `xml2-config --libs` -BIN_LDFLAGS += -lpthread -llogthread -lcpg -lconfdb -lcfg -lquorum -lfenced +BIN_LDFLAGS += -lpthread -lrt -lcpg -lconfdb -lcfg -lquorum -lfenced LIB_CFLAGS += $(BIN_CFLAGS) LIB_LDFLAGS += -Wl,-z,relro -pie diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 9c180d7..5d12296 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -271,6 +271,7 @@ void deadlk_confchg(struct lockspace *ls, /* main.c */ int do_read(int fd, void *buf, size_t count); int do_write(int fd, void *buf, size_t count); +uint64_t monotime(void); void client_dead(int ci); int client_add(int fd, void (*workfn)(int ci), void (*deadfn)(int ci)); int client_fd(int ci); @@ -319,7 +320,6 @@ void clear_plocks_data(struct lockspace *ls); /* logging.c */ void init_logging(void); -void setup_logging(void); void close_logging(void); void copy_log_dump(char *buf, int *len); void copy_log_dump_plock(char *buf, int *len); diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c index cb3c7fb..bf1a0eb 100644 --- a/dlm_controld/logging.c +++ b/dlm_controld/logging.c @@ -1,14 +1,13 @@ #include "dlm_daemon.h" -static int log_mode; static int syslog_facility; static int syslog_priority; static int logfile_priority; static char logfile[PATH_MAX]; +static FILE *logfile_fp; void init_logging(void) { - log_mode = DEFAULT_LOG_MODE; syslog_facility = DEFAULT_SYSLOG_FACILITY; syslog_priority = DEFAULT_SYSLOG_PRIORITY; logfile_priority = DEFAULT_LOGFILE_PRIORITY; @@ -20,36 +19,22 @@ void init_logging(void) if (cfgd_debug_logfile) logfile_priority = LOG_DEBUG; - log_debug("logging mode %d syslog f %d p %d logfile p %d %s", - log_mode, syslog_facility, syslog_priority, - logfile_priority, logfile); - - logt_init(DAEMON_NAME, log_mode, syslog_facility, syslog_priority, - logfile_priority, logfile); -} - -void setup_logging(void) -{ - - /* TODO: look for settings for each of these in dlm.conf */ - /* - ccs_read_logging(ccs_handle, DAEMON_NAME, - &cfgd_debug_logfile, &log_mode, - &syslog_facility, &syslog_priority, - &logfile_priority, logfile); - */ - - log_debug("logging mode %d syslog f %d p %d logfile p %d %s", - log_mode, syslog_facility, syslog_priority, - logfile_priority, logfile); + if (logfile[0]) { + logfile_fp = fopen(logfile, "a+"); + if (logfile_fp != NULL) { + int fd = fileno(logfile_fp); + fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC); + } + } - logt_conf(DAEMON_NAME, log_mode, syslog_facility, syslog_priority, - logfile_priority, logfile); + openlog(DAEMON_NAME, LOG_CONS | LOG_PID, syslog_facility); } void close_logging(void) { - logt_exit(); + closelog(); + if (logfile_fp) + fclose(logfile_fp); } #define NAME_ID_SIZE 32 @@ -142,7 +127,7 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...) snprintf(name, NAME_ID_SIZE, "%s ", name_in); ret = snprintf(log_str + pos, len - pos, "%llu %s", - (unsigned long long)time(NULL), name); + (unsigned long long)monotime(), name); pos += ret; @@ -162,8 +147,17 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...) log_save_str(level, pos - 1, log_dump, &log_point, &log_wrap); if (plock) log_save_str(level, pos - 1, log_dump_plock, &log_point_plock, &log_wrap_plock); - if (level) - logt_print(level, "%s", log_str); + + if (level <= syslog_priority) + syslog(level, "%s", log_str); + + if (level <= logfile_priority && logfile_fp) { + time_t logtime = time(NULL); + char tbuf[64]; + strftime(tbuf, sizeof(tbuf), "%b %d %T", localtime(&logtime)); + fprintf(logfile_fp, "%s %s", tbuf, log_str); + fflush(logfile_fp); + } if (!daemon_debug_opt) return; diff --git a/dlm_controld/main.c b/dlm_controld/main.c index 2be088a..e940fc0 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -62,6 +62,13 @@ int do_write(int fd, void *buf, size_t count) return 0; } +uint64_t monotime(void) +{ + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec; +} + static void client_alloc(void) { int i; @@ -871,8 +878,6 @@ static void loop(void) setup_config(0); - setup_logging(); - rv = check_uncontrolled_lockspaces(); if (rv < 0) goto out; @@ -1240,10 +1245,17 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } } - fd = lockfile(RUNDIR, RUN_FILE_NAME); + init_logging(); + + fd = lockfile(RUNDIR, RUN_FILE_NAME); + if (fd < 0) + return fd; + log_level(NULL, LOG_INFO, "dlm_controld %s started", RELEASE_VERSION); + signal(SIGTERM, sigterm_handler); + set_scheduler(); loop();

1 0

dlm: master - Makefiles: more munging
by David Teigland 05 Oct '11

05 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=9a61259694… Commit: 9a6125969490e49cd843b02feb23de1fc53c94ad Parent: c9186e3cf1b9c7aa5305fccdddc82f6bf75a8694 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Oct 5 16:48:07 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 5 16:48:07 2011 -0500 Makefiles: more munging --- dlm_controld/Makefile | 16 +++++++++------- dlm_tool/Makefile | 9 +++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index d83ead8..25b1ea4 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -1,3 +1,12 @@ +DESTDIR= +PREFIX=/usr +LIBNUM=/lib64 +BINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/$(LIBNUM) +HDRDIR=$(PREFIX)/include +MANDIR=$(PREFIX)/share/man +INIDIR=/etc/init.d + BIN_TARGET = dlm_controld MAN_TARGET = dlm_controld.8 @@ -76,13 +85,6 @@ clean: INSTALL=$(shell which install) -DESTDIR= -BINDIR=/usr/sbin -LIBDIR=/usr/lib64 -HDRDIR=/usr/include -MANDIR=/usr/share/man -INIDIR=/etc/init.d - .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR) diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile index f2cd4b6..b4f65bb 100644 --- a/dlm_tool/Makefile +++ b/dlm_tool/Makefile @@ -1,3 +1,8 @@ +DESTDIR= +PREFIX=/usr +BINDIR=$(PREFIX)/sbin +MANDIR=$(PREFIX)/share/man + BIN_TARGET = dlm_tool MAN_TARGET = dlm_tool.8 @@ -41,10 +46,6 @@ clean: INSTALL=$(shell which install) -DESTDIR= -BINDIR=/usr/sbin -MANDIR=/usr/share/man - .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR)

1 0

dlm: master - dlm: add init.d file
by David Teigland 05 Oct '11

05 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=c9186e3cf1… Commit: c9186e3cf1b9c7aa5305fccdddc82f6bf75a8694 Parent: bc70e884fdfdbed3cf51091f506be415716982da Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Oct 5 16:44:03 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 5 16:44:03 2011 -0500 dlm: add init.d file Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/Makefile | 34 +++++++++------ dlm_controld/dlm.in | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 13 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index e846b05..d83ead8 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -4,6 +4,8 @@ MAN_TARGET = dlm_controld.8 HDR_TARGET = libdlmcontrol.h +INI_TARGET = dlm + LIB_NAME = libdlmcontrol LIB_MAJOR = 3 LIB_MINOR = 1 @@ -11,16 +13,17 @@ LIB_SO = $(LIB_NAME).so LIB_SMAJOR = $(LIB_SO).$(LIB_MAJOR) LIB_TARGET = $(LIB_SO).$(LIB_MAJOR).$(LIB_MINOR) -BIN_SOURCE = \ - action.c \ - cpg.c \ - crc.c \ - main.c \ - plock.c \ - config.c \ - member_cman.c \ - logging.c \ - rbtree.c +BIN_SOURCE = action.c \ + cpg.c \ + crc.c \ + main.c \ + plock.c \ + config.c \ + member_cman.c \ + logging.c \ + rbtree.c +LIB_SOURCE = lib.c +INI_SOURCE = dlm.in BIN_CFLAGS += -D_GNU_SOURCE -g \ -Wall \ @@ -51,11 +54,10 @@ BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie BIN_LDFLAGS += `xml2-config --libs` BIN_LDFLAGS += -lpthread -llogthread -lcpg -lconfdb -lcfg -lquorum -lfenced -LIB_SOURCE = lib.c LIB_CFLAGS += $(BIN_CFLAGS) LIB_LDFLAGS += -Wl,-z,relro -pie -all: $(LIB_TARGET) $(BIN_TARGET) +all: $(LIB_TARGET) $(BIN_TARGET) $(INI_TARGET) $(BIN_TARGET): $(BIN_SOURCE) $(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $(BIN_SOURCE) -o $@ -L. @@ -64,9 +66,12 @@ $(LIB_TARGET): $(LIB_SOURCE) $(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_SMAJOR) $^ ln -sf $(LIB_TARGET) $(LIB_SO) ln -sf $(LIB_TARGET) $(LIB_SMAJOR) + +$(INI_TARGET): $(INI_SOURCE) + cp $(INI_SOURCE) $(INI_TARGET) clean: - rm -f *.o *.so *.so.* $(BIN_TARGET) + rm -f *.o *.so *.so.* $(BIN_TARGET) $(LIB_TARGET) $(INI_TARGET) INSTALL=$(shell which install) @@ -76,16 +81,19 @@ BINDIR=/usr/sbin LIBDIR=/usr/lib64 HDRDIR=/usr/include MANDIR=/usr/share/man +INIDIR=/etc/init.d .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR) $(INSTALL) -d $(DESTDIR)/$(LIBDIR) $(INSTALL) -d $(DESTDIR)/$(HDRDIR) + $(INSTALL) -d $(DESTDIR)/$(INIDIR) $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 $(INSTALL) -c -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR) $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR) + $(INSTALL) -m 755 $(INI_TARGET) $(DESTDIR)/$(INIDIR) $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ diff --git a/dlm_controld/dlm.in b/dlm_controld/dlm.in new file mode 100644 index 0000000..c2eb711 --- /dev/null +++ b/dlm_controld/dlm.in @@ -0,0 +1,110 @@ +#!/bin/sh +# +# dlm_controld +# +# chkconfig: 21 79 +# description: starts and stops dlm_controld +# + + +### BEGIN INIT INFO +# Provides: dlm_controld +# Required-Start: $network $time $syslog corosync +# Required-Stop: $syslog +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts and stops dlm_controld +# Description: starts and stops dlm_controld +### END INIT INFO + +. /etc/rc.d/init.d/functions + +prog="dlm_controld" +progdir="cluster" +lockfile="/var/run/$progdir/$prog.pid" +exec="/usr/sbin/$prog" + +[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +start() { + [ -x $exec ] || exit 5 + + if [ ! -d /var/run/$progdir ]; then + mkdir -p /var/run/$progdir + [ -x /usr/sbin/restorecon ] && restorecon /var/run/$progdir + fi + + echo -n $"Starting $prog: " + daemon $prog $DLM_CONTROLD_OPTS + retval=$? + echo + [ $retval -eq 0 ] + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $lockfile $prog -TERM + retval=$? + echo + [ $retval -eq 0 ] +} + +wait_for_stop() { + while [ -e $lockfile ]; do + sleep .5 + done +} + +restart() { + stop + wait_for_stop + start +} + +reload() { + restart +} + +rh_status() { + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? +

1 0

dlm: master - dlm_controld: clean up default defines and their usage
by David Teigland 05 Oct '11

05 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=bc70e884fd… Commit: bc70e884fdfdbed3cf51091f506be415716982da Parent: 3ee4f78d0039e1dc67382cfc4a2ada0ae2c1851f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Oct 5 15:33:02 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 5 16:27:47 2011 -0500 dlm_controld: clean up default defines and their usage Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/config.c | 8 ++-- dlm_controld/dlm_daemon.h | 35 ++++++++++++-------- dlm_controld/logging.c | 3 +- dlm_controld/main.c | 76 +++++++++++++++++++++++++++++++------------- 4 files changed, 80 insertions(+), 42 deletions(-) diff --git a/dlm_controld/config.c b/dlm_controld/config.c index 40b0c87..6c94fca 100644 --- a/dlm_controld/config.c +++ b/dlm_controld/config.c @@ -46,18 +46,18 @@ void setup_config(int update) xmlNode *root; xmlChar *str; - if (!path_exists(DLM_CONFIG_FILE)) + if (!path_exists(CONF_FILE_PATH)) return; - doc = xmlParseFile(DLM_CONFIG_FILE); + doc = xmlParseFile(CONF_FILE_PATH); if (!doc) { - log_error("xml parse error %d %s", errno, DLM_CONFIG_FILE); + log_error("xml parse error %d %s", errno, CONF_FILE_PATH); return; } root = xmlDocGetRootElement(doc); if (!root) { - log_error("xml root error %d %s", errno, DLM_CONFIG_FILE); + log_error("xml root error %d %s", errno, CONF_FILE_PATH); xmlFreeDoc(doc); return; } diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 9627118..9c180d7 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -43,20 +43,27 @@ #include "rbtree.h" #include "linux_endian.h" -/* TODO: cleanup */ -#define CLUSTERVARLIB "/var/lib/cluster" -#define CLUSTERVARRUN "/var/run/cluster" -#define LOGDIR "/var/log/cluster" -#define SYSLOGFACILITY LOG_LOCAL4 -#define SYSLOGLEVEL LOG_INFO -#define LOCKFILE_NAME CLUSTERVARRUN "/dlm_controld.pid" -#define DAEMON_NAME "dlm_controld" -#define DEFAULT_LOG_MODE LOG_MODE_OUTPUT_FILE|LOG_MODE_OUTPUT_SYSLOG -#define DEFAULT_SYSLOG_FACILITY SYSLOGFACILITY -#define DEFAULT_SYSLOG_PRIORITY SYSLOGLEVEL -#define DEFAULT_LOGFILE_PRIORITY LOG_INFO /* ? */ -#define DEFAULT_LOGFILE LOGDIR "/" DAEMON_NAME ".log" -#define DLM_CONFIG_FILE "/etc/dlm.conf" +/* TODO: get CONFDIR, LOGDIR, RUNDIR from build */ + +#define RUNDIR "/var/run/cluster" +#define LOGDIR "/var/log/cluster" +#define CONFDIR "/etc" + +#define RUN_FILE_NAME "dlm_controld.pid" +#define LOG_FILE_NAME "dlm_controld.log" +#define CONF_FILE_NAME "dlm.conf" + +#define RUN_FILE_PATH RUNDIR "/" RUN_FILE_NAME +#define LOG_FILE_PATH LOGDIR "/" LOG_FILE_NAME +#define CONF_FILE_PATH CONFDIR "/" CONF_FILE_NAME + +#define DEFAULT_LOG_MODE LOG_MODE_OUTPUT_FILE | LOG_MODE_OUTPUT_SYSLOG +#define DEFAULT_SYSLOG_FACILITY LOG_LOCAL4 +#define DEFAULT_SYSLOG_PRIORITY LOG_INFO +#define DEFAULT_LOGFILE_PRIORITY LOG_INFO +#define DEFAULT_LOGFILE LOG_FILE_PATH + +#define DAEMON_NAME "dlm_controld" /* DLM_LOCKSPACE_LEN: maximum lockspace name length, from linux/dlmconstants.h. diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c index e6e82b7..cb3c7fb 100644 --- a/dlm_controld/logging.c +++ b/dlm_controld/logging.c @@ -30,7 +30,8 @@ void init_logging(void) void setup_logging(void) { - /* TODO */ + + /* TODO: look for settings for each of these in dlm.conf */ /* ccs_read_logging(ccs_handle, DAEMON_NAME, &cfgd_debug_logfile, &log_mode, diff --git a/dlm_controld/main.c b/dlm_controld/main.c index 0fa10fb..2be088a 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -989,20 +989,29 @@ static void loop(void) log_error("abandoned lockspace %s", ls->name); } -static void lockfile(void) +static int lockfile(const char *dir, const char *name) { - int fd, error; + char path[PATH_MAX]; + char buf[16]; struct flock lock; - char buf[33]; + mode_t old_umask; + int fd, rv; - memset(buf, 0, 33); + old_umask = umask(0022); + rv = mkdir(dir, 0777); + if (rv < 0 && errno != EEXIST) { + umask(old_umask); + return rv; + } + umask(old_umask); - fd = open(LOCKFILE_NAME, O_CREAT|O_WRONLY, - S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); + snprintf(path, PATH_MAX, "%s/%s", dir, name); + + fd = open(path, O_CREAT|O_WRONLY|O_CLOEXEC, 0666); if (fd < 0) { - fprintf(stderr, "cannot open/create lock file %s\n", - LOCKFILE_NAME); - exit(EXIT_FAILURE); + log_error("lockfile open error %s: %s", + path, strerror(errno)); + return -1; } lock.l_type = F_WRLCK; @@ -1010,25 +1019,43 @@ static void lockfile(void) lock.l_whence = SEEK_SET; lock.l_len = 0; - error = fcntl(fd, F_SETLK, &lock); - if (error) { - fprintf(stderr, "dlm_controld is already running\n"); - exit(EXIT_FAILURE); + rv = fcntl(fd, F_SETLK, &lock); + if (rv < 0) { + log_error("lockfile setlk error %s: %s", + path, strerror(errno)); + goto fail; } - error = ftruncate(fd, 0); - if (error) { - fprintf(stderr, "cannot clear lock file %s\n", LOCKFILE_NAME); - exit(EXIT_FAILURE); + rv = ftruncate(fd, 0); + if (rv < 0) { + log_error("lockfile truncate error %s: %s", + path, strerror(errno)); + goto fail; } - sprintf(buf, "%d\n", getpid()); + memset(buf, 0, sizeof(buf)); + snprintf(buf, sizeof(buf), "%d\n", getpid()); - error = write(fd, buf, strlen(buf)); - if (error <= 0) { - fprintf(stderr, "cannot write lock file %s\n", LOCKFILE_NAME); - exit(EXIT_FAILURE); + rv = write(fd, buf, strlen(buf)); + if (rv <= 0) { + log_error("lockfile write error %s: %s", + path, strerror(errno)); + goto fail; } + + return fd; + fail: + close(fd); + return -1; +} + +static void unlink_lockfile(int fd, const char *dir, const char *name) +{ + char path[PATH_MAX]; + + snprintf(path, PATH_MAX, "%s/%s", dir, name); + unlink(path); + close(fd); } static void print_usage(void) @@ -1200,6 +1227,8 @@ static void set_scheduler(void) int main(int argc, char **argv) { + int fd; + INIT_LIST_HEAD(&lockspaces); INIT_LIST_HEAD(&fs_register_list); @@ -1211,7 +1240,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } } - lockfile(); + fd = lockfile(RUNDIR, RUN_FILE_NAME); init_logging(); log_level(NULL, LOG_INFO, "dlm_controld %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); @@ -1219,6 +1248,7 @@ int main(int argc, char **argv) loop(); + unlink_lockfile(fd, RUNDIR, RUN_FILE_NAME); return 0; }

1 0

dlm: master - version.cf: define RELEASE_VERSION
by David Teigland 05 Oct '11

05 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=3ee4f78d00… Commit: 3ee4f78d0039e1dc67382cfc4a2ada0ae2c1851f Parent: 0ffe7415f206a9a874fe853b519e9f2a1d4c39e8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Oct 4 14:23:48 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 5 15:15:25 2011 -0500 version.cf: define RELEASE_VERSION Signed-off-by: David Teigland <teigland(a)redhat.com> --- .gitignore | 42 ------------------------------------------ Makefile | 15 +++++++++++++++ dlm_controld/Makefile | 2 +- dlm_controld/dlm_daemon.h | 2 -- dlm_controld/main.c | 7 +++++-- dlm_tool/main.c | 3 ++- include/version.cf | 6 ++++++ 7 files changed, 29 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 9b3b81a..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +0,0 @@ -*.swp -Makefile.in -aclocal.m4 -autoconf -autoheader -autom4te.cache -automake -compile -configure -config.guess -config.log -config.sub -config.status -Makefile -depcomp -install-sh -libtoolize -ltmain.sh -libtool -make/stamp-h1 -m4 -make/clusterautoconfig.h* -missing -*.pc -.deps -.libs -*.o -*.la -*.lo -dlm/tests/usertest/alternate-lvb -dlm/tests/usertest/asttest -dlm/tests/usertest/dlmtest -dlm/tests/usertest/dlmtest2 -dlm/tests/usertest/flood -dlm/tests/usertest/joinleave -dlm/tests/usertest/lstest -dlm/tests/usertest/lvb -dlm/tests/usertest/pingtest -dlm/tests/usertest/threads -dlm/tool/dlm_tool -group/dlm_controld/dlm_controld -group/dlm_controld/dlm_controld.pcmk diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0b6ec6a --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +all: + make -C libdlm $@ + make -C dlm_controld $@ + make -C dlm_tool $@ + +install: + make -C libdlm $@ + make -C dlm_controld $@ + make -C dlm_tool $@ + +clean: + make -C libdlm $@ + make -C dlm_controld $@ + make -C dlm_tool $@ + diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index 722d8c2..e846b05 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -45,7 +45,7 @@ BIN_CFLAGS += -D_GNU_SOURCE -g \ BIN_CFLAGS += -fPIE -DPIE BIN_CFLAGS += `xml2-config --cflags` -BIN_CFLAGS += -I../libdlm +BIN_CFLAGS += -I../include -I../libdlm BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie BIN_LDFLAGS += `xml2-config --libs` diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 0c89f67..9627118 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -47,10 +47,8 @@ #define CLUSTERVARLIB "/var/lib/cluster" #define CLUSTERVARRUN "/var/run/cluster" #define LOGDIR "/var/log/cluster" -#define VERSION "master" #define SYSLOGFACILITY LOG_LOCAL4 #define SYSLOGLEVEL LOG_INFO -#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2011 All rights reserved." #define LOCKFILE_NAME CLUSTERVARRUN "/dlm_controld.pid" #define DAEMON_NAME "dlm_controld" #define DEFAULT_LOG_MODE LOG_MODE_OUTPUT_FILE|LOG_MODE_OUTPUT_SYSLOG diff --git a/dlm_controld/main.c b/dlm_controld/main.c index b0d9b03..0fa10fb 100644 --- a/dlm_controld/main.c +++ b/dlm_controld/main.c @@ -4,6 +4,9 @@ #include <linux/genetlink.h> #include <linux/dlm_netlink.h> +#include "copyright.cf" +#include "version.cf" + #define CLIENT_NALLOC 32 static int client_maxi; static int client_size = 0; @@ -1149,7 +1152,7 @@ static void read_arguments(int argc, char **argv) case 'V': printf("dlm_controld %s (built %s %s)\n", - VERSION, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; @@ -1210,7 +1213,7 @@ int main(int argc, char **argv) } lockfile(); init_logging(); - log_level(NULL, LOG_INFO, "dlm_controld %s started", VERSION); + log_level(NULL, LOG_INFO, "dlm_controld %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); set_scheduler(); diff --git a/dlm_tool/main.c b/dlm_tool/main.c index 4df930a..55593c0 100644 --- a/dlm_tool/main.c +++ b/dlm_tool/main.c @@ -16,6 +16,7 @@ #include "libdlm.h" #include "libdlmcontrol.h" #include "copyright.cf" +#include "version.cf" #define LKM_IVMODE -1 @@ -252,7 +253,7 @@ static void decode_arguments(int argc, char **argv) case 'V': printf("%s %s (built %s %s)\n", - prog_name, VERSION, __DATE__, __TIME__); + prog_name, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; diff --git a/include/version.cf b/include/version.cf new file mode 100644 index 0000000..80e8f4a --- /dev/null +++ b/include/version.cf @@ -0,0 +1,6 @@ +#ifndef _RELEASE_VERSION_CF_ +#define _RELEASE_VERSION_CF_ + +#define RELEASE_VERSION "master" + +#endif

1 0

gfs2-utils: master - libgfs2: Don't count sentinel dirent as an entry
by Andrew Price 05 Oct '11

05 Oct '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 5b2c8e2e8bd72d54da60f84bfc3e119826e0e610 Parent: b9236511fd2d579f89cb6eca3f8a556d86c739ae Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Wed Oct 5 00:18:17 2011 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Wed Oct 5 14:56:26 2011 +0100 libgfs2: Don't count sentinel dirent as an entry dir_split_leaf() adds a sentinel dirent using dirent_alloc() which increments di_entries in the directory dinode. Since sentinel dirents aren't real directory entries, di_entries becomes too high in some situations. This patch decrements di_entries after the sentinel dirent is created to fix the discrepancy. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/libgfs2/fs_ops.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c index ecd54ca..fe7fce6 100644 --- a/gfs2/libgfs2/fs_ops.c +++ b/gfs2/libgfs2/fs_ops.c @@ -953,6 +953,8 @@ static void dir_split_leaf(struct gfs2_inode *dip, uint32_t lindex, if (dirent_alloc(dip, nbh, 0, &new)) die("dir_split_leaf (4)\n"); new->de_inum.no_formal_ino = 0; + /* Don't count the sentinel dirent as an entry */ + dip->i_di.di_entries--; } oleaf->lf_depth = be16_to_cpu(oleaf->lf_depth) + 1;

1 0

gfs2-utils: master - gfs2_jadd: Fix error handlers
by cmaiolino 04 Oct '11

04 Oct '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: b9236511fd2d579f89cb6eca3f8a556d86c739ae Parent: 02a6d06f271a90a0457b30005bc221e46b6f0efe Author: Carlos Maiolino <cmaiolino(a)redhat.com> AuthorDate: Tue Oct 4 15:14:52 2011 -0300 Committer: Carlos Maiolino <cmaiolino(a)redhat.com> CommitterDate: Tue Oct 4 15:14:52 2011 -0300 gfs2_jadd: Fix error handlers This patch fixes some error handlers, taking advantage of glic on most places where an error check is needed. Also, it adds some exit() calls missing in mkfs and gfs2_grow --- gfs2/mkfs/main_grow.c | 8 ++- gfs2/mkfs/main_jadd.c | 149 ++++++++++++++++++++++-------------------------- gfs2/mkfs/main_mkfs.c | 8 ++- 3 files changed, 80 insertions(+), 85 deletions(-) diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index c48497f..f6d7bf0 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -310,8 +310,10 @@ main_grow(int argc, char *argv[]) sdp->path_name = argv[optind++]; sdp->path_fd = open(sdp->path_name, O_RDONLY | O_CLOEXEC); - if (sdp->path_fd < 0) + if (sdp->path_fd < 0){ perror(sdp->path_name); + exit(EXIT_FAILURE); + } if (check_for_gfs2(sdp)) { perror(sdp->path_name); @@ -319,8 +321,10 @@ main_grow(int argc, char *argv[]) } sdp->device_fd = open(sdp->device_name, (test ? O_RDONLY : O_RDWR) | O_CLOEXEC); - if (sdp->device_fd < 0) + if (sdp->device_fd < 0){ perror(sdp->device_name); + exit(EXIT_FAILURE); + } if (device_geometry(sdp)) { perror(_("Device geometry error")); diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c index d722d52..e060cc2 100644 --- a/gfs2/mkfs/main_jadd.c +++ b/gfs2/mkfs/main_jadd.c @@ -34,15 +34,21 @@ make_jdata(int fd, const char *value) uint32_t val; err = ioctl(fd, FS_IOC_GETFLAGS, &val); - if (err) - die( _("error doing get flags (%d): %s\n"), err, strerror(errno)); + if (err){ + perror("GETFLAGS"); + exit(EXIT_FAILURE); + } + if (strcmp(value, "set") == 0) val |= FS_JOURNAL_DATA_FL; if (strcmp(value, "clear") == 0) val &= ~FS_JOURNAL_DATA_FL; err = ioctl(fd, FS_IOC_SETFLAGS, &val); - if (err) - die( _("error doing set flags (%d): %s\n"), err, strerror(errno)); + + if (err){ + perror("SETFLAGS"); + exit(EXIT_FAILURE); + } } static int @@ -211,11 +217,14 @@ create_new_inode(struct gfs2_sbd *sdp) break; if (errno == EEXIST) { error = unlink(name); - if (error) - die( _("can't unlink %s: %s\n"), - name, strerror(errno)); - } else - die( _("can't create %s: %s\n"), name, strerror(errno)); + if (error){ + perror("unlink"); + exit(EXIT_FAILURE); + } + } else{ + perror("create"); + exit(EXIT_FAILURE); + } } return fd; @@ -236,10 +245,8 @@ add_ir(struct gfs2_sbd *sdp) memset(&ir, 0, sizeof(struct gfs2_inum_range)); if (write(fd, (void*)&ir, sizeof(struct gfs2_inum_range)) != sizeof(struct gfs2_inum_range)) { - fprintf(stderr, _( "write error: %s from %s:%d: " - "offset 0\n"), strerror(errno), - __FUNCTION__, __LINE__); - exit(-1); + perror("add_ir"); + exit(EXIT_FAILURE); } } @@ -247,9 +254,10 @@ add_ir(struct gfs2_sbd *sdp) sprintf(new_name, "inum_range%u", sdp->md.journals); error = rename2system(sdp, "per_node", new_name); - if (error < 0 && errno != EEXIST) - die( _("can't rename2system %s (%d): %s\n"), - new_name, error, strerror(errno)); + if (error < 0 && errno != EEXIST){ + perror("add_ir rename2system"); + exit(EXIT_FAILURE); + } } static void @@ -268,10 +276,8 @@ add_sc(struct gfs2_sbd *sdp) memset(&sc, 0, sizeof(struct gfs2_statfs_change)); if (write(fd, (void*)&sc, sizeof(struct gfs2_statfs_change)) != sizeof(struct gfs2_statfs_change)) { - fprintf(stderr, _("write error: %s from %s:%d: " - "offset 0\n"), strerror(errno), - __FUNCTION__, __LINE__); - exit(-1); + perror("add_sc"); + exit(EXIT_FAILURE); } } @@ -279,9 +285,10 @@ add_sc(struct gfs2_sbd *sdp) sprintf(new_name, "statfs_change%u", sdp->md.journals); error = rename2system(sdp, "per_node", new_name); - if (error < 0 && errno != EEXIST) - die( _("can't rename2system %s (%d): %s\n"), - new_name, error, strerror(errno)); + if (error < 0 && errno != EEXIST){ + perror("add_sc rename2system"); + exit(EXIT_FAILURE); + } } static void @@ -307,13 +314,8 @@ add_qc(struct gfs2_sbd *sdp) for (x=0; x<blocks; x++) { if (write(fd, buf, sdp->bsize) != sdp->bsize) { - fprintf(stderr, _("write error: %s from %s:%d: " - "block %lld (0x%llx)\n"), - strerror(errno), - __FUNCTION__, __LINE__, - (unsigned long long)x, - (unsigned long long)x); - exit(-1); + perror("add_qc"); + exit(EXIT_FAILURE); } } @@ -327,29 +329,26 @@ add_qc(struct gfs2_sbd *sdp) for (x=0; x<blocks; x++) { if (write(fd, buf, sdp->bsize) != sdp->bsize) { - fprintf(stderr, _("write error: %s from %s:%d: " - "block %lld (0x%llx)\n"), - strerror(errno), - __FUNCTION__, __LINE__, - (unsigned long long)x, - (unsigned long long)x); - exit(-1); + perror("add_qc"); + exit(EXIT_FAILURE); } } error = fsync(fd); - if (error) - die( _("can't fsync: %s\n"), - strerror(errno)); + if (error){ + perror("add_qc fsync"); + exit(EXIT_FAILURE); + } } close(fd); sprintf(new_name, "quota_change%u", sdp->md.journals); error = rename2system(sdp, "per_node", new_name); - if (error < 0 && errno != EEXIST) - die( _("can't rename2system %s (%d): %s\n"), - new_name, error, strerror(errno)); + if (error < 0 && errno != EEXIST){ + perror("add_qc rename2system"); + exit(EXIT_FAILURE); + } } static void @@ -357,8 +356,8 @@ gather_info(struct gfs2_sbd *sdp) { struct statfs statbuf; if (statfs(sdp->path_name, &statbuf) < 0) { - die( _("Could not statfs the filesystem %s: %s\n"), - sdp->path_name, strerror(errno)); + perror(sdp->path_name); + exit(EXIT_FAILURE); } sdp->bsize = statbuf.f_bsize; } @@ -374,8 +373,8 @@ find_current_journals(struct gfs2_sbd *sdp) sprintf(jindex, "%s/jindex", sdp->metafs_path); dirp = opendir(jindex); if (!dirp) { - die( _("Could not find the jindex directory " - "in gfs2meta mount! error: %s\n"), strerror(errno)); + perror("jindex"); + exit(EXIT_FAILURE); } while (dirp) { if ((dp = readdir(dirp)) != NULL) { @@ -415,13 +414,8 @@ add_j(struct gfs2_sbd *sdp) memset(buf, 0, sdp->bsize); for (x=0; x<blocks; x++) { if (write(fd, buf, sdp->bsize) != sdp->bsize) { - fprintf(stderr, _("write error: %s from %s:%d: " - "block %lld (0x%llx)\n"), - strerror(errno), - __FUNCTION__, __LINE__, - (unsigned long long)x, - (unsigned long long)x); - exit(-1); + perror("add_j"); + exit(EXIT_FAILURE); } } @@ -445,13 +439,8 @@ add_j(struct gfs2_sbd *sdp) ((struct gfs2_log_header *)buf)->lh_hash = cpu_to_be32(hash); if (write(fd, buf, sdp->bsize) != sdp->bsize) { - fprintf(stderr, _("write error: %s from %s:%d: " - "block %lld (0x%llx)\n"), - strerror(errno), - __FUNCTION__, __LINE__, - (unsigned long long)x, - (unsigned long long)x); - exit(-1); + perror("add_j"); + exit(EXIT_FAILURE); } if (++seq == blocks) @@ -459,18 +448,20 @@ add_j(struct gfs2_sbd *sdp) } error = fsync(fd); - if (error) - die( _("can't fsync: %s\n"), - strerror(errno)); + if (error){ + perror("add_j fsync"); + exit(EXIT_FAILURE); + } } close(fd); sprintf(new_name, "journal%u", sdp->md.journals); error = rename2system(sdp, "jindex", new_name); - if (error < 0 && errno != EEXIST) - die( _("can't rename2system %s (%d): %s\n"), - new_name, error, strerror(errno)); + if (error < 0 && errno != EEXIST){ + perror("add_j rename2system"); + exit(EXIT_FAILURE); + } } /** @@ -494,30 +485,26 @@ void main_jadd(int argc, char *argv[]) verify_arguments(sdp); sdp->path_fd = open(sdp->path_name, O_RDONLY | O_CLOEXEC); - if (sdp->path_fd < 0) - die( _("can't open root directory %s: %s\n"), - sdp->path_name, strerror(errno)); + if (sdp->path_fd < 0){ + perror(sdp->path_name); + exit(EXIT_FAILURE); + } if (check_for_gfs2(sdp)) { - if (errno == EINVAL) - fprintf(stderr, _("Not a valid GFS2 mount point: %s\n"), - sdp->path_name); - else - fprintf(stderr, "%s\n", strerror(errno)); - exit(-1); + perror(sdp->path_name); + exit(EXIT_FAILURE); } gather_info(sdp); if (mount_gfs2_meta(sdp)) { - fprintf(stderr, _("Error mounting GFS2 metafs: %s\n"), - strerror(errno)); - exit(-1); + perror("GFS2 metafs"); + exit(EXIT_FAILURE); } if (compute_constants(sdp)) { - fprintf(stderr, _("Bad constants (1)\n")); - exit(-1); + perror(_("Bad constants (1)")); + exit(EXIT_FAILURE); } find_current_journals(sdp); diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 771feba..6de1d12 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -683,13 +683,17 @@ void main_mkfs(int argc, char *argv[]) gfs2_rgrp_free(&sdp->rgtree); error = fsync(sdp->device_fd); - if (error) + if (error){ perror(sdp->device_name); + exit(EXIT_FAILURE); + } error = close(sdp->device_fd); - if (error) + if (error){ perror(sdp->device_name); + exit(EXIT_FAILURE); + } print_results(sdp, real_device_size, uuid); }

1 0

gfs2-utils: master - gfs2_grow: fix error handling, i18n strings
by cmaiolino 04 Oct '11

04 Oct '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 02a6d06f271a90a0457b30005bc221e46b6f0efe Parent: 114ca2dfa825a313561c9c82e52b4c052b1d2cd4 Author: Carlos Maiolino <cmaiolino(a)redhat.com> AuthorDate: Tue Oct 4 11:46:55 2011 -0300 Committer: Carlos Maiolino <cmaiolino(a)redhat.com> CommitterDate: Tue Oct 4 11:46:55 2011 -0300 gfs2_grow: fix error handling, i18n strings This patch fixes some error handling into gfs2_grow, but also fix some strings to be complaing with i18n. Also, it fixes 2 perror calls from mkfs, removing new-line characters (\n) from the perror() call, since perror() should be called without any format character --- gfs2/mkfs/main_grow.c | 52 ++++++++++++++++++++---------------------------- gfs2/mkfs/main_mkfs.c | 4 +- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index 7a32d7e..c48497f 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -202,7 +202,7 @@ static void fix_rindex(struct gfs2_sbd *sdp, int rindex_fd, int old_rg_count) buf = calloc(1, writelen); if (buf == NULL) { perror(__FUNCTION__); - exit(-1); + exit(EXIT_FAILURE); } /* Now add the new rg entries to the rg index. Here we */ /* need to use the gfs2 kernel code rather than the libgfs2 */ @@ -219,13 +219,13 @@ static void fix_rindex(struct gfs2_sbd *sdp, int rindex_fd, int old_rg_count) fsync(sdp->device_fd); if (!test) { if (fstat(rindex_fd, &statbuf) != 0) { - log_crit("Can't stat rindex : %s\n", strerror(errno)); + perror("rindex"); goto out; } if (statbuf.st_size != old_rg_count * sizeof(struct gfs2_rindex)) { - log_crit("Incorrect rindex size. want %ld(%d RGs), " - "have %ld\n", + log_crit(_("Incorrect rindex size. want %ld(%d RGs), " + "have %ld\n"), old_rg_count * sizeof(struct gfs2_rindex), old_rg_count, statbuf.st_size); goto out; @@ -234,8 +234,8 @@ static void fix_rindex(struct gfs2_sbd *sdp, int rindex_fd, int old_rg_count) lseek(rindex_fd, 0, SEEK_END); count = write(rindex_fd, buf, sizeof(struct gfs2_rindex)); if (count != sizeof(struct gfs2_rindex)) { - log_crit("Error writing first new rindex entry;" - "aborted.\n"); + log_crit(_("Error writing first new rindex entry;" + "aborted.\n")); if (count > 0) goto trunc; else @@ -244,16 +244,15 @@ static void fix_rindex(struct gfs2_sbd *sdp, int rindex_fd, int old_rg_count) count = write(rindex_fd, buf + sizeof(struct gfs2_rindex), writelen - sizeof(struct gfs2_rindex)); if (count != writelen - sizeof(struct gfs2_rindex)) { - log_crit("Error writing new rindex entries;" - "aborted.\n"); + log_crit(_("Error writing new rindex entries;" + "aborted.\n")); if (count > 0) goto trunc; else goto out; } if (fallocate(rindex_fd, FALLOC_FL_KEEP_SIZE, statbuf.st_size + writelen, sizeof(struct gfs2_rindex)) != 0) - log_crit("Error fallocating extra space : %s\n", - strerror(errno)); + perror("fallocate"); fsync(rindex_fd); } out: @@ -261,7 +260,7 @@ out: return; trunc: count = (count / sizeof(struct gfs2_rindex)) + old_rg_count; - log_crit("truncating rindex to %ld\n", + log_crit(_("truncating rindex to %ld\n"), (off_t)count * sizeof(struct gfs2_rindex)); ftruncate(rindex_fd, (off_t)count * sizeof(struct gfs2_rindex)); free(buf); @@ -312,26 +311,20 @@ main_grow(int argc, char *argv[]) sdp->path_name = argv[optind++]; sdp->path_fd = open(sdp->path_name, O_RDONLY | O_CLOEXEC); if (sdp->path_fd < 0) - die("can't open root directory %s: %s\n", - sdp->path_name, strerror(errno)); + perror(sdp->path_name); if (check_for_gfs2(sdp)) { - if (errno == EINVAL) - fprintf(stderr, - _("Not a valid GFS2 mount point: %s\n"), - sdp->path_name); - else - fprintf(stderr, "%s\n", strerror(errno)); - exit(-1); + perror(sdp->path_name); + exit(EXIT_FAILURE); } sdp->device_fd = open(sdp->device_name, (test ? O_RDONLY : O_RDWR) | O_CLOEXEC); if (sdp->device_fd < 0) - die( _("can't open device %s: %s\n"), - sdp->device_name, strerror(errno)); + perror(sdp->device_name); + if (device_geometry(sdp)) { - fprintf(stderr, _("Geometry error\n")); - exit(-1); + perror(_("Device geometry error")); + exit(EXIT_FAILURE); } log_info( _("Initializing lists...\n")); sdp->rgtree.osi_node = NULL; @@ -340,8 +333,8 @@ main_grow(int argc, char *argv[]) sdp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE; sdp->bsize = sdp->sd_sb.sb_bsize; if (compute_constants(sdp)) { - log_crit(_("Bad constants (1)\n")); - exit(-1); + perror(_("Bad constants (1)")); + exit(EXIT_FAILURE); } if (read_sb(sdp, 0) < 0) die( _("gfs: Error reading superblock.\n")); @@ -349,13 +342,12 @@ main_grow(int argc, char *argv[]) if (fix_device_geometry(sdp)) { fprintf(stderr, _("Device is too small (%llu bytes)\n"), (unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT); - exit(-1); + exit(EXIT_FAILURE); } if (mount_gfs2_meta(sdp)) { - fprintf(stderr, _("Error mounting GFS2 metafs: %s\n"), - strerror(errno)); - exit(-1); + perror("GFS2 metafs"); + exit(EXIT_FAILURE); } sprintf(rindex_name, "%s/rindex", sdp->metafs_path); diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index f35f5b0..771feba 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -591,7 +591,7 @@ void main_mkfs(int argc, char *argv[]) verify_bsize(sdp); if (compute_constants(sdp)) { - perror(_("Bad constants (1)\n")); + perror(_("Bad constants (1)")); exit(EXIT_FAILURE); } @@ -599,7 +599,7 @@ void main_mkfs(int argc, char *argv[]) device_size(sdp->device_fd, &real_device_size); if (device_geometry(sdp)) { - perror(_("Device geometry error\n")); + perror(_("Device geometry error")); exit(EXIT_FAILURE); } /* Convert optional block-count to basic blocks */

1 0

gfs2-utils: master - mkfs: fix error handling
by cmaiolino 04 Oct '11

04 Oct '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 114ca2dfa825a313561c9c82e52b4c052b1d2cd4 Parent: e2e273467a776ef257e1d7e284088ae9e7cbec43 Author: Carlos Maiolino <cmaiolino(a)redhat.com> AuthorDate: Tue Oct 4 10:20:12 2011 -0300 Committer: Carlos Maiolino <cmaiolino(a)redhat.com> CommitterDate: Tue Oct 4 10:20:12 2011 -0300 mkfs: fix error handling this patch replaces some error handlers by calls to perror. Also replace calls to die() by exit() and fixes some exit() arguments to be compliant with C standard --- gfs2/mkfs/main_mkfs.c | 59 +++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 29 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 0bd1410..f35f5b0 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -551,22 +551,22 @@ void main_mkfs(int argc, char *argv[]) verify_arguments(sdp); sdp->device_fd = open(sdp->device_name, O_RDWR | O_CLOEXEC); - if (sdp->device_fd < 0) - die( _("can't open device %s: %s\n"), - sdp->device_name, strerror(errno)); + if (sdp->device_fd < 0){ + perror(sdp->device_name); + exit(EXIT_FAILURE); + } if (fstat(sdp->device_fd, &st_buf) < 0) { - fprintf(stderr, _("could not fstat fd %d: %s\n"), - sdp->device_fd, strerror(errno)); - exit(-1); + perror(sdp->device_name); + exit(EXIT_FAILURE); } if (!sdp->override) are_you_sure(); if (!S_ISREG(st_buf.st_mode) && device_topology(sdp)) { - fprintf(stderr, _("Device topology error\n")); - exit(-1); + perror(_("Device topology error\n")); + exit(EXIT_FAILURE); } if (sdp->bsize == -1) { @@ -591,16 +591,16 @@ void main_mkfs(int argc, char *argv[]) verify_bsize(sdp); if (compute_constants(sdp)) { - fprintf(stderr, _("Bad constants (1)\n")); - exit(-1); + perror(_("Bad constants (1)\n")); + exit(EXIT_FAILURE); } /* Get the device geometry */ device_size(sdp->device_fd, &real_device_size); if (device_geometry(sdp)) { - fprintf(stderr, _("Geometry error\n")); - exit(-1); + perror(_("Device geometry error\n")); + exit(EXIT_FAILURE); } /* Convert optional block-count to basic blocks */ if (sdp->orig_fssize) { @@ -618,7 +618,7 @@ void main_mkfs(int argc, char *argv[]) if (fix_device_geometry(sdp)) { fprintf(stderr, _("Device is too small (%llu bytes)\n"), (unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT); - exit(-1); + exit(EXIT_FAILURE); } if (discard) @@ -639,35 +639,35 @@ void main_mkfs(int argc, char *argv[]) build_sb(sdp, uuid); error = build_jindex(sdp); if (error) { - fprintf(stderr, _("Error building jindex: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building jindex")); + exit(EXIT_FAILURE); } error = build_per_node(sdp); if (error) { - fprintf(stderr, _("Error building per-node directory: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building per-node directory")); + exit(EXIT_FAILURE); } error = build_inum(sdp); if (error) { - fprintf(stderr, _("Error building inum inode: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building inum inode")); + exit(EXIT_FAILURE); } gfs2_lookupi(sdp->master_dir, "inum", 4, &sdp->md.inum); error = build_statfs(sdp); if (error) { - fprintf(stderr, _("Error building statfs inode: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building statfs inode")); + exit(EXIT_FAILURE); } gfs2_lookupi(sdp->master_dir, "statfs", 6, &sdp->md.statfs); error = build_rindex(sdp); if (error) { - fprintf(stderr, _("Error building rindex inode: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building rindex inode")); + exit(EXIT_FAILURE); } error = build_quota(sdp); if (error) { - fprintf(stderr, _("Error building quota inode: %s\n"), strerror(error)); - exit(-1); + perror(_("Error building quota inode")); + exit(EXIT_FAILURE); } do_init_inum(sdp); @@ -682,13 +682,14 @@ void main_mkfs(int argc, char *argv[]) gfs2_rgrp_free(&sdp->rgtree); error = fsync(sdp->device_fd); + if (error) - die( _("can't fsync device (%d): %s\n"), - error, strerror(errno)); + perror(sdp->device_name); + error = close(sdp->device_fd); + if (error) - die( _("error closing device (%d): %s\n"), - error, strerror(errno)); + perror(sdp->device_name); print_results(sdp, real_device_size, uuid); }

1 0

dlm: master - libdlm: more Makefile munging
by David Teigland 03 Oct '11

03 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=0ffe7415f2… Commit: 0ffe7415f206a9a874fe853b519e9f2a1d4c39e8 Parent: 59d16cbb84bb33fe7331cdcade20f007abd26096 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 3 16:55:02 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 3 16:55:02 2011 -0500 libdlm: more Makefile munging Signed-off-by: David Teigland <teigland(a)redhat.com> --- libdlm/Makefile | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libdlm/Makefile b/libdlm/Makefile index 7f4be49..9a8c383 100644 --- a/libdlm/Makefile +++ b/libdlm/Makefile @@ -1,10 +1,11 @@ DESTDIR= PREFIX=/usr -LIBDIR=/usr/lib64 -HDRDIR=/usr/include -MANDIR=/usr/share/man -PKGDIR=/usr/lib64/pkgconfig -UDEVDIR=/etc/udev/rules.d +LIBNUM=/lib64 +LIBDIR=$(PREFIX)/$(LIBNUM) +HDRDIR=$(PREFIX)/include +MANDIR=$(PREFIX)/share/man +PKGDIR=$(PREFIX)/$(LIBNUM)/pkgconfig +UDEVDIR=/lib/udev/rules.d LIB_NAME = libdlm LIB_MAJOR = 3

1 0

dlm: master - libdlm: add pkgconfig files
by David Teigland 03 Oct '11

03 Oct '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=59d16cbb84… Commit: 59d16cbb84bb33fe7331cdcade20f007abd26096 Parent: 3bc9b4611a837632c6bc89586c0fdce2bdb5ba4d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 3 13:21:03 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 3 13:21:03 2011 -0500 libdlm: add pkgconfig files Signed-off-by: David Teigland <teigland(a)redhat.com> --- libdlm/Makefile | 31 +++++++++++++++++++++++-------- libdlm/libdlm.pc.in | 10 ++++++++++ libdlm/libdlm_lt.pc.in | 10 ++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/libdlm/Makefile b/libdlm/Makefile index 2b8b6d3..7f4be49 100644 --- a/libdlm/Makefile +++ b/libdlm/Makefile @@ -1,3 +1,11 @@ +DESTDIR= +PREFIX=/usr +LIBDIR=/usr/lib64 +HDRDIR=/usr/include +MANDIR=/usr/share/man +PKGDIR=/usr/lib64/pkgconfig +UDEVDIR=/etc/udev/rules.d + LIB_NAME = libdlm LIB_MAJOR = 3 LIB_MINOR = 0 @@ -5,6 +13,8 @@ LIB_O = $(LIB_NAME).o LIB_SO = $(LIB_NAME).so LIB_SMAJOR = $(LIB_SO).$(LIB_MAJOR) LIB_TARGET = $(LIB_SO).$(LIB_MAJOR).$(LIB_MINOR) +LIB_PC = $(LIB_NAME).pc +LIB_PCIN = $(LIB_NAME).pc.in LLT_NAME = libdlm_lt LLT_MAJOR = 3 @@ -13,6 +23,8 @@ LLT_O = $(LLT_NAME).o LLT_SO = $(LLT_NAME).so LLT_SMAJOR = $(LLT_SO).$(LLT_MAJOR) LLT_TARGET = $(LLT_SO).$(LLT_MAJOR).$(LLT_MINOR) +LLT_PC = $(LLT_NAME).pc +LLT_PCIN = $(LLT_NAME).pc.in HDR_TARGET = libdlm.h @@ -72,7 +84,7 @@ LDFLAGS += -Wl LIB_LDFLAGS += $(LDFLAGS) -lpthread LLT_LDFLAGS += $(LDFLAGS) -all: $(LIB_TARGET) $(LLT_TARGET) +all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC) $(LIB_O): $(SOURCE) $(CC) $(LIB_CFLAGS) -c -o $@ $< @@ -90,27 +102,30 @@ $(LLT_TARGET): $(LLT_O) ln -sf $(LLT_TARGET) $(LLT_SO) ln -sf $(LLT_TARGET) $(LLT_SMAJOR) +$(LIB_PC): $(LIB_PCIN) + cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g' > $@ + +$(LLT_PC): $(LLT_PCIN) + cat $(LIB_PCIN) | sed -e 's#@PREFIX@#$(PREFIX)#g' > $@ + clean: - rm -f *.o *.so *.so.* *.a + rm -f *.o *.so *.so.* *.a *.pc INSTALL=$(shell which install) -DESTDIR= -LIBDIR=/usr/lib64 -HDRDIR=/usr/include -MANDIR=/usr/share/man -UDEVDIR=/etc/udev/rules.d - .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(LIBDIR) $(INSTALL) -d $(DESTDIR)/$(HDRDIR) $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man3 + $(INSTALL) -d $(DESTDIR)/$(PKGDIR) $(INSTALL) -d $(DESTDIR)/$(UDEVDIR) $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) $(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR) cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR) $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR) $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man3/ $(INSTALL) -m 644 $(UDEV_TARGET) $(DESTDIR)/$(UDEVDIR) diff --git a/libdlm/libdlm.pc.in b/libdlm/libdlm.pc.in new file mode 100644 index 0000000..3a51bfc --- /dev/null +++ b/libdlm/libdlm.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib64 + +Name: libdlm +Description: The dlm library +Version: 4.0.0 +Cflags: -I${includedir} +Libs: -L${libdir} -ldlm -lpthread diff --git a/libdlm/libdlm_lt.pc.in b/libdlm/libdlm_lt.pc.in new file mode 100644 index 0000000..36d3974 --- /dev/null +++ b/libdlm/libdlm_lt.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib64 + +Name: libdlm_lt +Description: The non-threaded dlm library +Version: 4.0.0 +Cflags: -I${includedir} +Libs: -L${libdir} -ldlm_lt

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2011