first fixes to the DHT transmission process

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5588 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Feb 10, 2009 · 6a876ec · 6a876ec
1 parent de610b9
commit 6a876ec
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 261 deletions.
diff --git a/htroot/rct_p.java b/htroot/rct_p.java
@@ -39,9 +39,9 @@
 import de.anomic.xml.RSSFeed;
 import de.anomic.xml.RSSMessage;
 import de.anomic.yacy.yacyClient;
-import de.anomic.yacy.yacyPeerSelection;
 import de.anomic.yacy.yacySeed;
 import de.anomic.yacy.yacyURL;
+import de.anomic.yacy.dht.PeerSelection;
 
 public class rct_p {
 
@@ -116,7 +116,7 @@ private static void listHosts(final plasmaSwitchboard sb, final serverObjects pr
         yacySeed seed;
         int hc = 0;
         if (sb.webIndex.seedDB != null && sb.webIndex.seedDB.sizeConnected() > 0) {
-            final Iterator<yacySeed> e = yacyPeerSelection.getProvidesRemoteCrawlURLs(sb.webIndex.seedDB);
+            final Iterator<yacySeed> e = PeerSelection.getProvidesRemoteCrawlURLs(sb.webIndex.seedDB);
             while (e.hasNext()) {
                 seed = e.next();
                 if (seed != null) {

diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java
@@ -41,9 +41,9 @@
 import de.anomic.yacy.yacyClient;
 import de.anomic.yacy.yacyCore;
 import de.anomic.yacy.yacyNetwork;
-import de.anomic.yacy.yacyPeerSelection;
 import de.anomic.yacy.yacySeed;
 import de.anomic.yacy.yacyVersion;
+import de.anomic.yacy.dht.PeerSelection;
 
 public final class hello {
 
@@ -184,7 +184,7 @@ public static serverObjects respond(final httpRequestHeader header, final server
             if (count > 100) { count = 100; }
 
             // latest seeds
-            final Map<String, yacySeed> ySeeds = yacyPeerSelection.seedsByAge(sb.webIndex.seedDB, true, count); // peerhash/yacySeed relation
+            final Map<String, yacySeed> ySeeds = PeerSelection.seedsByAge(sb.webIndex.seedDB, true, count); // peerhash/yacySeed relation
 
             // attach also my own seed
             seeds.append("seed0=").append(sb.webIndex.seedDB.mySeed().genSeedStr(key)).append(serverCore.CRLF_STRING);

diff --git a/source/de/anomic/crawler/CrawlQueues.java b/source/de/anomic/crawler/CrawlQueues.java
@@ -47,9 +47,9 @@
 import de.anomic.xml.RSSFeed;
 import de.anomic.xml.RSSMessage;
 import de.anomic.yacy.yacyClient;
-import de.anomic.yacy.yacyPeerSelection;
 import de.anomic.yacy.yacySeed;
 import de.anomic.yacy.yacyURL;
+import de.anomic.yacy.dht.PeerSelection;
 
 public class CrawlQueues {
 
@@ -335,7 +335,7 @@ public boolean remoteCrawlLoaderJob() {
         yacySeed seed;
         if (remoteCrawlProviderHashes.size() == 0) {
             if (sb.webIndex.seedDB != null && sb.webIndex.seedDB.sizeConnected() > 0) {
-                final Iterator<yacySeed> e = yacyPeerSelection.getProvidesRemoteCrawlURLs(sb.webIndex.seedDB);
+                final Iterator<yacySeed> e = PeerSelection.getProvidesRemoteCrawlURLs(sb.webIndex.seedDB);
                 while (e.hasNext()) {
                     seed = e.next();
                     if (seed != null) {

diff --git a/source/de/anomic/index/indexRAMRI.java b/source/de/anomic/index/indexRAMRI.java
@@ -138,6 +138,7 @@ public int getMaxWordCount() {
     }
 
     public int size() {
+    	if (heap == null) return 0;
         return heap.size();
     }
 

diff --git a/source/de/anomic/plasma/plasmaSearchAPI.java b/source/de/anomic/plasma/plasmaSearchAPI.java
@@ -39,9 +39,9 @@
 import de.anomic.kelondro.order.Bitfield;
 import de.anomic.kelondro.order.DateFormatter;
 import de.anomic.server.serverObjects;
-import de.anomic.yacy.yacyPeerSelection;
 import de.anomic.yacy.yacySeed;
 import de.anomic.yacy.yacyURL;
+import de.anomic.yacy.dht.PeerSelection;
 
 public class plasmaSearchAPI {
     // collection of static methods for a search servlet. Exists only to prevent that the same processes are defined more than once.
@@ -73,7 +73,7 @@ public static void listHosts(final serverObjects prop, final String startHash, f
         yacySeed seed;
         int hc = 0;
         prop.put("searchresult_keyhash", startHash);
-        final Iterator<yacySeed> e = yacyPeerSelection.getAcceptRemoteIndexSeeds(sb.webIndex.seedDB, startHash, sb.webIndex.seedDB.sizeConnected(), true);
+        final Iterator<yacySeed> e = PeerSelection.getAcceptRemoteIndexSeeds(sb.webIndex.seedDB, startHash, sb.webIndex.seedDB.sizeConnected(), true);
         while (e.hasNext()) {
             seed = e.next();
             if (seed != null) {

diff --git a/source/de/anomic/yacy/dht/Transmission.java b/source/de/anomic/yacy/dht/Transmission.java
@@ -194,7 +194,7 @@ public boolean transmit() {
             	log.logInfo("Transfer of chunk to myself-target");
             	return true;
             }
-            log.logInfo("starting new index transmission thread " + this.primaryTarget);
+            log.logInfo("starting new index transmission request to " + this.primaryTarget);
             long start = System.currentTimeMillis();
             final HashMap<String, Object> ohm = yacyClient.transferIndex(target, this.containers, this.references, gzipBody4Transfer, timeout4Transfer);
             final String result = (String) ohm.get("result");
@@ -219,7 +219,9 @@ public boolean transmit() {
                 return true;
             }
             this.miss++;
-            seeds.peerActions.peerDeparture(target, "did not accept index");
+            // write information that peer does not receive index transmissions
+            target.setFlagAcceptRemoteIndex(false);
+            seeds.update(target.hash, target);
             log.logInfo("Transfer failed of chunk to target " + target.hash + "/" + target.getName());
             return false;
         }

diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java
@@ -58,6 +58,7 @@
 import de.anomic.server.serverSemaphore;
 import de.anomic.xml.RSSFeed;
 import de.anomic.xml.RSSMessage;
+import de.anomic.yacy.dht.PeerSelection;
 
 public class yacyCore {
 
@@ -305,7 +306,7 @@ private int publishMySeed(final boolean force) {
             if (sb.webIndex.seedDB.mySeed().get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN).equals(yacySeed.PEERTYPE_VIRGIN)) {
                 if (attempts > PING_INITIAL) { attempts = PING_INITIAL; }
                 final Map<String, String> ch = plasmaSwitchboard.getSwitchboard().clusterhashes;
-                seeds = yacyPeerSelection.seedsByAge(sb.webIndex.seedDB, true, attempts - ((ch == null) ? 0 : ch.size())); // best for fast connection
+                seeds = PeerSelection.seedsByAge(sb.webIndex.seedDB, true, attempts - ((ch == null) ? 0 : ch.size())); // best for fast connection
                 // add also all peers from cluster if this is a public robinson cluster
                 if (ch != null) {
                     final Iterator<Map.Entry<String, String>> i = ch.entrySet().iterator();
@@ -332,7 +333,7 @@ private int publishMySeed(final boolean force) {
                 } else {
                     if (attempts > PING_MIN_RUNNING) { attempts = PING_MIN_RUNNING; }
                 }
-                seeds = yacyPeerSelection.seedsByAge(sb.webIndex.seedDB, false, attempts); // best for seed list maintenance/cleaning
+                seeds = PeerSelection.seedsByAge(sb.webIndex.seedDB, false, attempts); // best for seed list maintenance/cleaning
             }
 
             if ((seeds == null) || seeds.size() == 0) { return 0; }

diff --git a/source/de/anomic/yacy/yacyPeerSelection.java b/source/de/anomic/yacy/yacyPeerSelection.java