Changeset 5838

Timestamp:

Aug 11, 2009, 8:39:47 AM (15 years ago)

Author:

Christoph Mayer

Message:

watchdog bootstrapping und kleine relay fixes

Location:

source/ariba

Files:

• SideportListener.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (4 diffs)
• overlay/OverlayBootstrap.cpp (modified) (4 diffs)
• overlay/OverlayBootstrap.h (modified) (6 diffs)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (modified) (1 diff)

source/ariba/SideportListener.cpp

@@ -86 +86 @@
         if( overlay == NULL ) return false;
 
+        bool relay = false;
+
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
+
+                // is we find a direct connection this is not a relayed node
+                if(link->relay == false && link->remoteNode == node && link->up)
+                        return false;
+
+                // if we find a relay conenction this can be a relayed node
+                // but only if we find no direct connection as above
                 if( link->relay && link->remoteNode == node && link->up)
-                        return true;
+                        relay = true;
         }
 
-        return false;
+        return relay;
 }
 

source/ariba/overlay/BaseOverlay.cpp

@@ -370 +370 @@
         }
 
-
         //ovl.visShowNodeBubble ( ovlId, nodeId, "joining..." );
         logging_info( "Starting to join spovnet " << id.toString() <<
@@ -399 +398 @@
                 const LinkID& lnk = bc->establishLink( bootstrapEp );
                 bootstrapLinks.push_back(lnk);
+
                 logging_info("join process initiated for " << id.toString() << "...");
+
         }
 }
@@ -1107 +1108 @@
                                 state = BaseOverlayStateCompleted;
                                 overlayInterface->createOverlay();
-
                                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
+
+                                //record bootstrap ep as good endpoint to join
+                                overlayBootstrap.recordJoin( replyMsg->getBootstrapEndpoint() );
 
                                 // update ovlvis
@@ -1555 +1558 @@
 
 vector<NodeID> BaseOverlay::getOverlayNeighbors(bool deep) const {
+
+        vector<NodeID> nodes = overlayInterface->getKnownNodes(deep);
+
         // the known nodes _can_ also include our node, so we remove ourself
-        vector<NodeID> nodes = overlayInterface->getKnownNodes(deep);
-
         vector<NodeID>::iterator i = find( nodes.begin(), nodes.end(), this->nodeId );
         if( i != nodes.end() ) nodes.erase( i );

source/ariba/overlay/OverlayBootstrap.cpp

@@ -50 +50 @@
                 spovnetid( SpoVNetID::UNSPECIFIED ),
                 nodeid( NodeID::UNSPECIFIED ),
-                overlay( NULL ){
+                overlay( NULL ),
+                watchtimer(this) {
+
+        srand(time(NULL));
 }
 
@@ -66 +69 @@
         manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+
+        watchtimer.startWatchdog();
 }
 
@@ -78 +83 @@
         manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+
+        watchtimer.stopWatchdog();
 }
 
@@ -144 +151 @@
 }
 
+void OverlayBootstrap::recordJoin(const EndpointDescriptor& _ep){
+        boost::mutex::scoped_lock lock(lastJoinesMutex);
+
+        EventData data;
+        data.spovnetid = spovnetid;
+        data.nodeid = nodeid;
+        data.endpoint = _ep;
+
+        lastJoines.push_front(JoinData(data));
+}
+
+void OverlayBootstrap::checkOverlayStatus(){
+
+        // if we have no overlay neighbors, try to bootstrap using
+        // bootstrap information that we already used
+
+        {       //limit history to 10 endpoints
+                boost::mutex::scoped_lock lock(lastJoinesMutex);
+                while(lastJoines.size() > 10)
+                        lastJoines.pop_back();
+        }
+
+        // we have overlay neighbors -> ok
+        if(overlay->getOverlayNeighbors().size() > 0) return;
+
+        // no overlay neighbors -> try out already
+        // successfully used bootstrap nodes
+        JoinData data;
+        {
+                boost::mutex::scoped_lock lock(lastJoinesMutex);
+                JoinStack::iterator i = lastJoines.begin();
+                if(i == lastJoines.end()) return;
+
+                // use last used element and then put it into back
+                JoinData data = *i;
+                lastJoines.pop_front();
+                lastJoines.push_back(data);
+        }
+
+        logging_info("no overlay connections detected, " <<
+                                        "trying to join using old bootstrap information");
+
+        // 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 );
+}
+
+OverlayBootstrap::WatchdogTimer::WatchdogTimer(OverlayBootstrap* _obj) : obj(_obj) {
+}
+
+void OverlayBootstrap::WatchdogTimer::startWatchdog(){
+        Timer::setInterval(2000);
+        Timer::start();
+}
+
+void OverlayBootstrap::WatchdogTimer::stopWatchdog(){
+        Timer::stop();
+}
+
+void OverlayBootstrap::WatchdogTimer::eventFunction(){
+        if(obj == NULL) return;
+        obj->checkOverlayStatus();
+}
+
 }} // namespace ariba, overlay

source/ariba/overlay/OverlayBootstrap.h

@@ -42 +42 @@
 #include <string>
 #include <sstream>
+#include <ctime>
+#include <deque>
+#include <boost/thread/mutex.hpp>
 #include "ariba/utility/logging/Logging.h"
 #include "ariba/utility/types.h"
+#include "ariba/utility/system/Timer.h"
 #include "ariba/utility/bootstrap/BootstrapManager.h"
 #include "ariba/utility/bootstrap/BootstrapInformationCallback.h"
@@ -52 +56 @@
 #include "ariba/utility/system/SystemEventType.h"
 
+using std::deque;
 using std::string;
 using std::ostringstream;
@@ -62 +67 @@
 using ariba::utility::SystemEvent;
 using ariba::utility::SystemQueue;
+using ariba::utility::Timer;
 using ariba::utility::SystemEventListener;
 
@@ -81 +87 @@
         void revoke();
 
+        void recordJoin(const EndpointDescriptor& _ep);
+
 protected:
         virtual void handleSystemEvent(const SystemEvent& event);
@@ -86 +94 @@
 
 private:
-        typedef struct _EventData {
+        class EventData {
+        public:
                 SpoVNetID spovnetid;
                 NodeID nodeid;
                 EndpointDescriptor endpoint;
-        } EventData;
+        };
 
         BootstrapManager& manager;
@@ -98 +107 @@
         string randname;
 
+        class JoinData {
+        public:
+                time_t timestamp;
+                EventData data;
+
+                JoinData(const EventData& _data){
+                        timestamp = time(NULL);
+                        data = _data;
+                }
+
+                JoinData(){
+                        timestamp = time(NULL);
+                }
+        };
+
+        class WatchdogTimer : public Timer {
+        public:
+                WatchdogTimer(OverlayBootstrap* _obj);
+                void startWatchdog();
+                void stopWatchdog();
+        protected:
+                virtual void eventFunction();
+        private:
+                OverlayBootstrap* obj;
+        };
+
+        typedef deque<JoinData> JoinStack;
+        JoinStack lastJoines;
+        boost::mutex lastJoinesMutex;
+        WatchdogTimer watchtimer;
+        void checkOverlayStatus();
 };
 

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp

@@ -58 +58 @@
 
 use_logging_cpp(PeriodicBroadcast);
-const long PeriodicBroadcast::timerinterval = 2;
-const long PeriodicBroadcast::servicetimeout = 5;
+const long PeriodicBroadcast::timerinterval = 1;
+const long PeriodicBroadcast::servicetimeout = 3;
 const unsigned int PeriodicBroadcast::serverport_v4 = 5634;
 const unsigned int PeriodicBroadcast::serverport_v6 = 5636;