Changeset 5860 for source/ariba/overlay/OverlayBootstrap.cpp

Timestamp:

Aug 11, 2009, 1:47:47 PM (16 years ago)

Author:

Christoph Mayer

Message:

networkinfo fix wenn socket kaputt geht, erfolgreich verwendete bootstrap infos speichern und wenn overlay verbindungen alle weg sind diese infos ausprobieren

File:

• source/ariba/overlay/OverlayBootstrap.cpp (modified) (6 diffs)

source/ariba/overlay/OverlayBootstrap.cpp

@@ -88 +88 @@
 
 void OverlayBootstrap::handleSystemEvent(const SystemEvent& event){
-        EventData* data = event.getData<EventData>();
+        JoinData* data = event.getData<JoinData>();
 
         // announcement for our spovnet
@@ -129 +129 @@
         //
 
-        EventData* data = new EventData();
+        JoinData* data = new JoinData();
         data->spovnetid = sid;
         data->nodeid = nid;
@@ -154 +154 @@
         boost::mutex::scoped_lock lock(lastJoinesMutex);
 
-        EventData data;
+        JoinData data;
         data.spovnetid = spovnetid;
         data.nodeid = nodeid;
         data.endpoint = _ep;
 
-        lastJoines.push_front(JoinData(data));
+        logging_info("recording bootstrap information " << data.endpoint.toString());
+
+        lastJoines.push_front(data);
 }
 
@@ -175 +177 @@
         // we have overlay neighbors -> ok
         if(overlay->getOverlayNeighbors().size() > 0) return;
+
+        logging_info("overlay not joined, checking for earlier used bootstrap information");
+        EndpointDescriptor joinep = EndpointDescriptor::UNSPECIFIED();
 
         // no overlay neighbors -> try out already
@@ -185 +190 @@
 
                 // use last used element and then put it into back
-                JoinData data = *i;
-                lastJoines.pop_front();
-                lastJoines.push_back(data);
+                joinep = (*i).endpoint;
+
+                if(lastJoines.size() >= 2)
+                        swap( *lastJoines.begin(), *(--(lastJoines.end())) );
         }
 
-        logging_info("no overlay connections detected, " <<
-                                        "trying to join using old bootstrap information");
+        logging_info("no overlay conenctivity detected, " <<
+                                        "trying to join using old bootstrap information: " <<
+                                        joinep.toString());
 
         // try to join using this node, if the join is successfull
         // the endpoint will again be inserted using recordJoin
-        overlay->joinSpoVNet( spovnetid, data.data.endpoint );
+        overlay->joinSpoVNet( spovnetid, joinep );
 }
 
@@ -202 +209 @@
 
 void OverlayBootstrap::WatchdogTimer::startWatchdog(){
-        Timer::setInterval(2000);
+        Timer::setInterval(5000);
         Timer::start();
 }