From 9c05736ef8cf819a8b9a7dc5c037918322d60875 Mon Sep 17 00:00:00 2001 From: Joshua Kissoon Date: Thu, 1 May 2014 11:41:12 +0530 Subject: [PATCH] Updated content lookup operation and node lookup operation - Use all nodes to these operations initially instead of the K-Closest because there may be the case that the K-Closest are offline - The operation takes care of looking at the K-Closest. --- .../operation/ContentLookupOperation.java | 4 ++ .../operation/NodeLookupOperation.java | 48 ++++++++++--------- src/kademlia/routing/KadBucket.java | 1 + 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/kademlia/operation/ContentLookupOperation.java b/src/kademlia/operation/ContentLookupOperation.java index 52ccc5b..b431c4f 100644 --- a/src/kademlia/operation/ContentLookupOperation.java +++ b/src/kademlia/operation/ContentLookupOperation.java @@ -97,6 +97,10 @@ public class ContentLookupOperation implements Operation, Receiver /* Set the local node as already asked */ nodes.put(this.localNode.getNode(), ASKED); + /** + * We add all nodes here instead of the K-Closest because there may be the case that the K-Closest are offline + * - The operation takes care of looking at the K-Closest. + */ this.addNodes(this.localNode.getRoutingTable().getAllNodes()); /** diff --git a/src/kademlia/operation/NodeLookupOperation.java b/src/kademlia/operation/NodeLookupOperation.java index 7cb399a..f47d054 100644 --- a/src/kademlia/operation/NodeLookupOperation.java +++ b/src/kademlia/operation/NodeLookupOperation.java @@ -36,14 +36,14 @@ public class NodeLookupOperation implements Operation, Receiver private static final String AWAITING = "Awaiting"; private static final String ASKED = "Asked"; private static final String FAILED = "Failed"; - + private final KadServer server; private final KademliaNode localNode; private final NodeId lookupId; private final KadConfiguration config; - + private boolean error; - + private final Message lookupMessage; // Message sent to each peer private final Map nodes; @@ -52,7 +52,7 @@ public class NodeLookupOperation implements Operation, Receiver /* Used to sort nodes */ private final Comparator comparator; - + { messagesTransiting = new HashMap<>(); @@ -70,7 +70,7 @@ public class NodeLookupOperation implements Operation, Receiver this.localNode = localNode; this.lookupId = lookupId; this.config = config; - + this.lookupMessage = new NodeLookupMessage(localNode.getNode(), lookupId); /** @@ -95,8 +95,12 @@ public class NodeLookupOperation implements Operation, Receiver /* Set the local node as already asked */ nodes.put(this.localNode.getNode(), ASKED); - - this.addNodes(this.localNode.getRoutingTable().findClosest(this.lookupId, this.config.k())); + + /** + * We add all nodes here instead of the K-Closest because there may be the case that the K-Closest are offline + * - The operation takes care of looking at the K-Closest. + */ + this.addNodes(this.localNode.getRoutingTable().getAllNodes()); /* If we haven't finished as yet, wait for a maximum of config.operationTimeout() time */ int totalTimeWaited = 0; @@ -121,14 +125,14 @@ public class NodeLookupOperation implements Operation, Receiver /* Now after we've finished, we would have an idea of offline nodes, lets update our routing table */ this.localNode.getRoutingTable().setUnresponsiveContacts(this.getFailedNodes()); - + } catch (InterruptedException e) { throw new RuntimeException(e); } } - + public List getClosestNodes() { return this.closestNodes(ASKED); @@ -172,7 +176,7 @@ public class NodeLookupOperation implements Operation, Receiver /* Get unqueried nodes among the K closest seen that have not FAILED */ List unasked = this.closestNodesNotFailed(UNASKED); - + if (unasked.isEmpty() && this.messagesTransiting.isEmpty()) { /* We have no unasked nodes nor any messages in transit, we're finished! */ @@ -187,9 +191,9 @@ public class NodeLookupOperation implements Operation, Receiver for (int i = 0; (this.messagesTransiting.size() < this.config.maxConcurrentMessagesTransiting()) && (i < unasked.size()); i++) { Node n = (Node) unasked.get(i); - + int comm = server.sendMessage(n, lookupMessage, this); - + this.nodes.put(n, AWAITING); this.messagesTransiting.put(comm, n); } @@ -207,7 +211,7 @@ public class NodeLookupOperation implements Operation, Receiver { List closestNodes = new ArrayList<>(this.config.k()); int remainingSpaces = this.config.k(); - + for (Map.Entry e : this.nodes.entrySet()) { if (status.equals(e.getValue())) @@ -220,7 +224,7 @@ public class NodeLookupOperation implements Operation, Receiver } } } - + return closestNodes; } @@ -236,7 +240,7 @@ public class NodeLookupOperation implements Operation, Receiver { List closestNodes = new ArrayList<>(this.config.k()); int remainingSpaces = this.config.k(); - + for (Map.Entry e : this.nodes.entrySet()) { if (!FAILED.equals(e.getValue())) @@ -246,14 +250,14 @@ public class NodeLookupOperation implements Operation, Receiver /* We got one with the required status, now add it */ closestNodes.add(e.getKey()); } - + if (--remainingSpaces == 0) { break; } } } - + return closestNodes; } @@ -297,7 +301,7 @@ public class NodeLookupOperation implements Operation, Receiver { /* Get the node associated with this communication */ Node n = this.messagesTransiting.get(new Integer(comm)); - + if (n == null) { throw new UnknownMessageException("Unknown comm: " + comm); @@ -307,14 +311,14 @@ public class NodeLookupOperation implements Operation, Receiver this.nodes.put(n, FAILED); this.localNode.getRoutingTable().setUnresponsiveContact(n); this.messagesTransiting.remove(comm); - + this.askNodesorFinish(); } - + public List getFailedNodes() { List failedNodes = new ArrayList<>(); - + for (Map.Entry e : this.nodes.entrySet()) { if (e.getValue().equals(FAILED)) @@ -322,7 +326,7 @@ public class NodeLookupOperation implements Operation, Receiver failedNodes.add(e.getKey()); } } - + return failedNodes; } } diff --git a/src/kademlia/routing/KadBucket.java b/src/kademlia/routing/KadBucket.java index 32f6c1f..a9b0f09 100644 --- a/src/kademlia/routing/KadBucket.java +++ b/src/kademlia/routing/KadBucket.java @@ -173,6 +173,7 @@ public class KadBucket implements Bucket /* Just return if this contact is already in our replacement cache */ if (this.replacementCache.containsKey(c)) { + /* @todo update last seen time */ return; }