etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timeout is not set for some commands

This commit is contained in:
anthony 2011-09-29 12:16:33 -07:00
parent 95ad8b26ea
commit 0bdd6ded96
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -825,6 +825,9 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
throw new AgentUnavailableException(-1);
}
if (timeout <= 0) {
timeout = _wait;
}
assert noDbTxn() : "I know, I know. Why are we so strict as to not allow txn across an agent call? ... Why are we so cruel ... Why are we such a dictator .... Too bad... Sorry...but NO AGENT COMMANDS WRAPPED WITHIN DB TRANSACTIONS!";
Command[] cmds = commands.toCommands();
@ -1507,9 +1510,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
wait = cmd.getWait();
}
}
if ( wait == 0 ) {
wait = _wait;
}
return send(hostId, cmds, wait);
}