cluster: RHEL58 - resource-agents: nfsclient: fix wildcard status checks
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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
12 years, 6 months
cluster: RHEL58 - resource-agents: Handle TREX and Webdispatcher in SAPInstance
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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" ]
12 years, 6 months
cluster: RHEL58 - rgmanager: Send events on service stop & preserve frozen flag
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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));
12 years, 6 months
cluster: RHEL58 - rgmanager: Mark services on dead nodes as stopped
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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)
12 years, 6 months
cluster: STABLE31 - rgmanager: Send events on service stop & preserve frozen flag
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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));
12 years, 6 months
cluster: RHEL58 - fence_ipmilan: is not parsing args with passwd_script option in cluster.conf
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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;
12 years, 6 months
cluster: RHEL58 - Bug 713295 - Do not turn cmirror init script on by default
by Jonathan Brassow
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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
#
#
12 years, 6 months
cluster: RHEL58 - rgmanager: Fix ASEHAagent to make server_name unique
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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>
12 years, 6 months
cluster: RHEL58 - rgmanager: Fix ASEHAagent to allow for multiple ASEHA resources on one machine.
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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>
12 years, 6 months
cluster: RHEL58 - rgmanager: Add -F to clusvcadm man page
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
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
12 years, 6 months
