From c3f1eca676f723fb6e0a9d10b6380d099bdfad12 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 11 Feb 2014 19:15:47 +0100
Subject: [PATCH] Feature #2665: Scheduler now tries to contact oned for
 ever...

---
 src/scheduler/src/sched/Scheduler.cc | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc
index 65b8ef797a..7dc8dd8a7b 100644
--- a/src/scheduler/src/sched/Scheduler.cc
+++ b/src/scheduler/src/sched/Scheduler.cc
@@ -218,9 +218,8 @@ void Scheduler::start()
     // -------------------------------------------------------------------------
     // Get oned configuration, and init zone_id
     // -------------------------------------------------------------------------
-    int tries = 0;
 
-    while (tries < 3)
+    while (1)
     {
         try
         {
@@ -240,29 +239,28 @@ void Scheduler::start()
 
             if (!success ||(oned_conf.from_xml(message) != 0))
             {
-                ostringstream  oss;
-                oss << "Wrong oned response: " << message;
+                ostringstream oss;
 
-                NebulaLog::log("SCHED", Log::WARNING, message);
+                oss << "Cannot contact oned, will retry... Error: " << message;
 
-                tries++;
+                NebulaLog::log("SCHED", Log::ERROR, oss);
             }
 
             break;
         }
         catch (exception const& e)
         {
-            tries++;
-            NebulaLog::log("SCHED", Log::WARNING, e.what());
+            ostringstream oss;
+
+            oss << "Cannot contact oned, will retry... Error: " << e.what();
+
+            NebulaLog::log("SCHED", Log::ERROR, oss);
         }
 
         sleep(2);
     }
 
-    if (tries >= 3)
-    {
-        throw runtime_error("Error contacting oned, check sched.log");
-    }
+    NebulaLog::log("SCHED", Log::INFO, "oned successfully contacted.");
 
     vector<const Attribute*> fed;