Attachment 864860 Details for Bug 918207 – 2 second timeout for uninventory

[patch] 2 second timeout for uninventory

BZ918207.patch (text/plain), 1.56 KB, created by Elias Ross on 2014-02-19 00:17:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elias Ross

Created: 2014-02-19 00:17:19 UTC

Size: 1.56 KB

patch

obsolete

>commit 73877e65ab330797a6450ae83bb1524a0daa3386
>Author: Elias Ross <elias_ross@apple.com>
>Date:   Mon Dec 2 14:06:54 2013 -0800
>
>    resource manager; even if ping works, sometimes it timeouts on uninventory
>    
>    set timeout on uninventory method to 2 seconds
>
>diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterpr
>index 72a5eac..2fa0773 100644
>--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
>+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
>@@ -437,10 +437,7 @@ public void uninventoryAllResourcesByAgent(Subject user, Agent doomedAgent) {
>                 if (agentClient.getAgent() == null || agentClient.getAgent().getName() == null
>                     || !agentClient.getAgent().getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // don't do that on "REST-agents"
>                     try {
>-                        boolean agentPing = agentClient.ping(2000L);
>-                        if (agentPing) {
>-                            agentClient.getDiscoveryAgentService().uninventoryResource(resourceId);
>-                        }
>+                        agentClient.getDiscoveryAgentService(2000L).uninventoryResource(resourceId);
>                     } catch (Exception e) {
>                         log.warn(" Unable to inform agent of inventory removal for resource [" + resourceId + "]", e);
>                     }
>

Actions: View | Diff

Attachments on bug 918207: 864860