527a76dc73
types for ABI compliance - stonith: Default to 20s timeout for start and monitor operations of stonith resources which is same as "default-action-timeout" (bnc#733337) - Tools: ptest - Fix "-X, --xml-text" option to handle a XML string as its argument (bnc#736212) - cib: Fix segfault caused by destroying an already freed hash table (cl#5023) - stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable (bnc#728579) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=31
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
commit a8ba707d19757e9aea4496e7bddf4ddc428ca582
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
Date: Tue Dec 13 14:48:26 2011 +0800
|
|
|
|
Low: stonith: Default to 20s timeout for start and monitor operations of stonith resources which is same as "default-action-timeout" (bnc#733337)
|
|
|
|
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
|
|
index 205bda8..a4977d5 100644
|
|
--- a/lib/fencing/st_client.c
|
|
+++ b/lib/fencing/st_client.c
|
|
@@ -97,10 +97,10 @@ static const char META_TEMPLATE[] =
|
|
" <shortdesc lang=\"en\">%s</shortdesc>\n"
|
|
"%s\n"
|
|
" <actions>\n"
|
|
- " <action name=\"start\" timeout=\"60\" />\n"
|
|
+ " <action name=\"start\" timeout=\"20\" />\n"
|
|
" <action name=\"stop\" timeout=\"15\" />\n"
|
|
- " <action name=\"status\" timeout=\"60\" />\n"
|
|
- " <action name=\"monitor\" timeout=\"60\" interval=\"3600\" start-delay=\"15\" />\n"
|
|
+ " <action name=\"status\" timeout=\"20\" />\n"
|
|
+ " <action name=\"monitor\" timeout=\"20\" interval=\"3600\" start-delay=\"15\" />\n"
|
|
" <action name=\"meta-data\" timeout=\"15\" />\n"
|
|
" </actions>\n"
|
|
" <special tag=\"heartbeat\">\n"
|