Changeset 10572

Timestamp:

Jun 18, 2012, 1:40:59 PM (13 years ago)

Author:

Michael Tänzer

Message:

Fix DHT: messages got lost if not communicating over a direct link.

Also:

• Fix mem leak
• Code clean up

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (12 diffs)
• messages/DHTMessage.cpp (modified) (1 diff)
• messages/DHTMessage.h (modified) (2 diffs)
• modules/OverlayInterface.h (modified) (1 diff)
• modules/chord/Chord.cpp (modified) (1 diff)
• modules/chord/Chord.h (modified) (1 diff)
• modules/onehop/OneHop.cpp (modified) (1 diff)
• modules/onehop/OneHop.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -1832 +1832 @@
 
         // handle dht messages (do not route)
-        if (overlayMsg->isDHTMessage())
-                return handleDHTMessage(overlayMsg);
+        if (overlayMsg->isDHTMessage()) {
+                bool ret = handleDHTMessage(overlayMsg);
+                delete overlayMsg;
+                return ret;
+        }
 
         // handle signaling messages (do not route!)
@@ -2161 +2164 @@
 
         // route message to closest node
-        if (!overlayInterface->isClosestNodeTo(msg->getDestinationNode())) {
+        if (!overlayInterface->isClosestNodeTo(dhtMsg->getHashedKey())) {
                 logging_debug("Routing DHT message to closest node "
                         << " from " << msg->getSourceNode()
-                        << " to " << msg->getDestinationNode()
+                        << " to " << dhtMsg->getHashedKey()
                 );
-                route( msg );
-                delete msg;
+                dhtSend(msg, dhtMsg->getHashedKey());
+                delete dhtMsg;
                 return true;
         }
@@ -2219 +2222 @@
                 return false;
         }
-        delete msg;
+        delete dhtMsg;
         return true;
 }
@@ -2239 +2242 @@
         }
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg( key, value );
         dhtmsg.setReplace( replace );
@@ -2247 +2248 @@
         OverlayMsg msg( OverlayMsg::typeDHTPut );
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2255 +2256 @@
         localDHT->remove(key,value);
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key,value);
 
@@ -2262 +2261 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2270 +2269 @@
         logging_info("DHT-Remove: Removing key=" << key );
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key);
 
@@ -2277 +2274 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2286 +2283 @@
                         key << " for service=" << service.toString() );
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key);
 
@@ -2294 +2289 @@
         msg.setService(service);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2303 +2298 @@
         /// set source and destination
         msg->setSourceNode(this->nodeId);
-        msg->setDestinationNode(dest);
 
         // local storage? yes-> put into DHT directly
-        if (overlayInterface->isClosestNodeTo(msg->getDestinationNode())) {
+        if (overlayInterface->isClosestNodeTo(dest)) {
+                // be compatible with old code so set destination to hashed key
+                msg->setDestinationNode(dest);
+                
                 Data d = data_serialize(msg);
-                Message* m2 = new Message(d);
-                OverlayMsg* m3 = m2->decapsulate<OverlayMsg>();
+                Message m2(d);
+                OverlayMsg* m3 = m2.decapsulate<OverlayMsg>();
+                
                 handleDHTMessage(m3);
-                delete m2;
+                
+                delete m3;
                 return;
-        }
-
-        // send message "normally"
-        send( msg, dest );
+        } else {
+                // need to route
+                NodeID next_hop = overlayInterface->getNextNodeId(dest);
+                msg->setDestinationNode(next_hop);
+                
+                send(msg, next_hop);
+                
+                return;
+        }
 }
 

source/ariba/overlay/messages/DHTMessage.cpp

@@ -8 +8 @@
 vsznDefault(DHTMessage);
 
-DHTMessage::DHTMessage() {
-        this->key.setLength(0);
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage() :
+        ttl( 0 ),
+        replace( false )
+{}
 
-DHTMessage::DHTMessage( const Data& key ) {
-        // calculate hash of key
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage( const Data& key ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() )
+{}
 
-DHTMessage::DHTMessage( const Data& key, const Data& value ) {
-        // calculate hash of key
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
-        this->values.push_back( value.clone() );
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage( const Data& key, const Data& value ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() ),
+        values(1, value.clone())
+{}
 
-DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) {
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
+DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() )
+{
+        // preallocate enough room so we don't need to copy a lot
+        this->values.reserve(values.size());
         BOOST_FOREACH(const Data value, values )
                 this->values.push_back( value.clone() );
-        this->ttl = 0;
-        this->replace = false;
 }
 

source/ariba/overlay/messages/DHTMessage.h

@@ -20 +20 @@
 
         const NodeID& getHashedKey() const {
-                return hash;
+                return NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
         }
 
@@ -58 +58 @@
 
 private:
-        NodeID hash;
         uint16_t ttl;
         bool replace;

source/ariba/overlay/modules/OverlayInterface.h

@@ -145 +145 @@
          */
         virtual const LinkID& getNextLinkId( const NodeID& id ) const = 0;
+        
+        /**
+         * Returns the NodeID of the next hop a route message would take.
+         * 
+         * @param id The destination node id
+         * @return The node id of the next hop
+         */
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         //--- functions from CommunicationListener that we _can_ use as overlay ---

source/ariba/overlay/modules/chord/Chord.cpp

@@ -201 +201 @@
 }
 
+/// @see OverlayInterface.h
+const NodeID& Chord::getNextNodeId( const NodeID& id ) const {
+        // get next hop
+        const route_item* item = table->get_next_hop(id);
+        
+        // return unspecified if no next hop could be found
+        if (item == NULL) {
+                return NodeID::UNSPECIFIED;
+        }
+        
+        return item->id;
+}
+
 OverlayInterface::NodeList Chord::getKnownNodes(bool deep) const {
         OverlayInterface::NodeList nodelist;

source/ariba/overlay/modules/chord/Chord.h

@@ -104 +104 @@
         /// @see OverlayInterface.h
         virtual const LinkID& getNextLinkId( const NodeID& id ) const;
+        
+        /// @see OverlayInterface.h
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         /// @see OverlayInterface.h

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -122 +122 @@
 }
 
+/// @see OverlayInterface.h
+const NodeID& OneHop::getNextNodeId( const NodeID& id ) const {
+        OverlayNodeMapping::const_iterator i = overlayNodes.find( id );
+        
+        // FIXME: in case the NodeID is not known we should return the nearest node
+        if (i == overlayNodes.end()) {
+                return NodeID::UNSPECIFIED;
+        }
+        
+        return i->first;
+}
+
 void OneHop::createOverlay() {
         // don't need to bootstrap against ourselfs.

source/ariba/overlay/modules/onehop/OneHop.h

@@ -85 +85 @@
         /// @see OverlayInterface.h
         virtual const LinkID& getNextLinkId( const NodeID& id ) const;
+        
+        /// @see OverlayInterface.h
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         /// @see OverlayInterface.h