Date: Monday, April 2, 2007 @ 20:00:09
Author: gilles
Path: /cvsroot/carob/carob/src
Modified: ControllerPool.cpp (1.26 -> 1.27)
Fixed CAROB-135, isVdbUpOnController() and setVdbDownOnController() infinite
loops
Also fixed wrong comment
--------------------+
ControllerPool.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: carob/src/ControllerPool.cpp
diff -u carob/src/ControllerPool.cpp:1.26 carob/src/ControllerPool.cpp:1.27
--- carob/src/ControllerPool.cpp:1.26 Thu Mar 1 16:26:15 2007
+++ carob/src/ControllerPool.cpp Mon Apr 2 20:00:09 2007
@@ -90,10 +90,10 @@
void AbstractControllerPool::setVdbDownOnController(const ControllerInfo&
controller)
{
LockScope ls(&pool_CS);
- // remove all occurences of the given controller
for (vector<ControllerAndVdbState>::iterator iter =
alive_controllers.begin();
- iter != alive_controllers.end();)
+ iter != alive_controllers.end(); iter++)
{
+ // update the last vdb failure timestamp of the given controller
if (iter->controller == controller)
{
iter->lastVdbFailure = currentTimeSeconds();
@@ -105,10 +105,10 @@
bool AbstractControllerPool::isVdbUpOnController(const ControllerInfo&
controller)
{
LockScope ls(&pool_CS);
- // remove all occurences of the given controller
for (vector<ControllerAndVdbState>::iterator iter =
alive_controllers.begin();
- iter != alive_controllers.end();)
+ iter != alive_controllers.end(); iter++)
{
+ // return true if the given controller's last vdb failure is older than 5s
if (iter->controller == controller)
return iter->isVdbUp(currentTimeSeconds());
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
