|
 |
ed0026 |
commit 21172ada434f549515d4480e821872b8cbd12566
|
|
|
ed0026 |
Author: David Vossel <dvossel@redhat.com>
|
|
|
ed0026 |
Date: Thu Oct 10 17:30:40 2013 -0500
|
|
|
ed0026 |
|
|
|
ed0026 |
Low: crmd: Pad internal lrmd rsc_info and metadata retrieval timeout
|
|
|
ed0026 |
|
|
|
ed0026 |
(cherry picked from commit 5c21a6b6e7789da50111f3d955593c7fbda1ddc2)
|
|
|
ed0026 |
|
|
|
ed0026 |
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
|
|
|
ed0026 |
index e577293..d037022 100644
|
|
|
ed0026 |
--- a/lib/lrmd/lrmd_client.c
|
|
|
ed0026 |
+++ b/lib/lrmd/lrmd_client.c
|
|
|
ed0026 |
@@ -1437,7 +1437,7 @@ lrmd_api_get_rsc_info(lrmd_t * lrmd, const char *rsc_id, enum lrmd_call_options
|
|
|
ed0026 |
|
|
|
ed0026 |
crm_xml_add(data, F_LRMD_ORIGIN, __FUNCTION__);
|
|
|
ed0026 |
crm_xml_add(data, F_LRMD_RSC_ID, rsc_id);
|
|
|
ed0026 |
- lrmd_send_command(lrmd, LRMD_OP_RSC_INFO, data, &output, 0, options, TRUE);
|
|
|
ed0026 |
+ lrmd_send_command(lrmd, LRMD_OP_RSC_INFO, data, &output, 30000, options, TRUE);
|
|
|
ed0026 |
free_xml(data);
|
|
|
ed0026 |
|
|
|
ed0026 |
if (!output) {
|
|
|
ed0026 |
@@ -1743,7 +1743,7 @@ generic_get_metadata(const char *standard, const char *provider, const char *typ
|
|
|
ed0026 |
type,
|
|
|
ed0026 |
"meta-data",
|
|
|
ed0026 |
0,
|
|
|
ed0026 |
- 5000,
|
|
|
ed0026 |
+ 30000,
|
|
|
ed0026 |
NULL);
|
|
|
ed0026 |
|
|
|
ed0026 |
if (!(services_action_sync(action))) {
|