From 82a682b31d30dcb35f9d3c10ccdc7fc9a616f00f Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 19 Jun 2012 07:44:44 +0200 Subject: [PATCH 1/6] fixed problem with seed when switching network --- source/net/yacy/peers/SeedDB.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/net/yacy/peers/SeedDB.java b/source/net/yacy/peers/SeedDB.java index 2f29e8cde..350b8de05 100644 --- a/source/net/yacy/peers/SeedDB.java +++ b/source/net/yacy/peers/SeedDB.java @@ -164,8 +164,6 @@ public final class SeedDB implements AlternativeDomainNames { final String peername = myName(); this.mySeed = null; // my own seed this.myOwnSeedFile = new File(newNetworkRoot, SeedDB.DBFILE_OWN_SEED); - initMySeed(); - this.mySeed.setName(peername); this.netRedundancy = redundancy; this.scheme = new VerticalWordPartitionScheme(partitionExponent); @@ -175,6 +173,9 @@ public final class SeedDB implements AlternativeDomainNames { this.seedPassiveDB = openSeedTable(this.seedPassiveDBFile); this.seedPotentialDB = openSeedTable(this.seedPotentialDBFile); + initMySeed(); + this.mySeed.setName(peername); + // check if we are in the seedCaches: this can happen if someone else published our seed removeMySeed(); From f7c43e964c7483899090fdf54caee18b3d958326 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 19 Jun 2012 08:23:10 +0200 Subject: [PATCH 2/6] enable asserts only with debugging --- startYACY.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/startYACY.sh b/startYACY.sh index 481618c83..8e80a8f56 100755 --- a/startYACY.sh +++ b/startYACY.sh @@ -73,8 +73,6 @@ for option in $options;do ;; -l|--logging) LOGGING=1 - # enable asserts - JAVA_ARGS="$JAVA_ARGS -ea" if [ $DEBUG -eq 1 ];then echo "can not combine -l and -d" exit 1; From de3ef8ad73d8a7c87c4de5bb5fa6e3bb1f02a01e Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 19 Jun 2012 08:45:34 +0200 Subject: [PATCH 3/6] removed unimportant warnings --- source/de/anomic/crawler/RobotsTxt.java | 3 ++- source/net/yacy/document/TextParser.java | 2 +- source/net/yacy/kelondro/blob/HeapReader.java | 8 +------- .../net/yacy/upnp/DiscoveryAdvertisement.java | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/source/de/anomic/crawler/RobotsTxt.java b/source/de/anomic/crawler/RobotsTxt.java index e0381b51c..64c0f4535 100644 --- a/source/de/anomic/crawler/RobotsTxt.java +++ b/source/de/anomic/crawler/RobotsTxt.java @@ -70,7 +70,8 @@ public class RobotsTxt { this.syncObjects = new ConcurrentHashMap(); this.tables = worktables; try { - log.info("initiated robots table: " + this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).getFile()); + this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME); + //log.info("initiated robots table: " + this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).getFile()); } catch (final IOException e) { try { this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).clear(); diff --git a/source/net/yacy/document/TextParser.java b/source/net/yacy/document/TextParser.java index 3dec938ba..d4a2ba225 100644 --- a/source/net/yacy/document/TextParser.java +++ b/source/net/yacy/document/TextParser.java @@ -135,7 +135,7 @@ public final class TextParser { if (prototypeMime != null) for (String ext: parser.supportedExtensions()) { ext = ext.toLowerCase(); final String s = ext2mime.get(ext); - if (s != null && !s.equals(prototypeMime)) log.logWarning("parser for extension '" + ext + "' was set to mime '" + s + "', overwriting with new mime '" + prototypeMime + "'."); + if (s != null && !s.equals(prototypeMime)) Log.logInfo("PARSER", "Parser for extension '" + ext + "' was set to mime '" + s + "', overwriting with new mime '" + prototypeMime + "'."); ext2mime.put(ext, prototypeMime); } diff --git a/source/net/yacy/kelondro/blob/HeapReader.java b/source/net/yacy/kelondro/blob/HeapReader.java index 251e5d435..8c6aa0b8a 100644 --- a/source/net/yacy/kelondro/blob/HeapReader.java +++ b/source/net/yacy/kelondro/blob/HeapReader.java @@ -663,13 +663,7 @@ public class HeapReader { * @return the length of the key */ public int keylength() { - assert (this.index != null) : "index == null; closeDate=" + this.closeDate + ", now=" + new Date(); - if (this.index == null) { - Log.logSevere("HeapReader", "this.index == null in keylength(); closeDate=" + this.closeDate + ", now=" + new Date() + this.heapFile == null ? "" : (" file = " + this.heapFile.toString())); - return 0; - } - if (this.index == null) return 0; - return this.index.row().primaryKeyLength; + return this.keylength; } /** diff --git a/source/net/yacy/upnp/DiscoveryAdvertisement.java b/source/net/yacy/upnp/DiscoveryAdvertisement.java index e088cebbc..f04eaf9c8 100644 --- a/source/net/yacy/upnp/DiscoveryAdvertisement.java +++ b/source/net/yacy/upnp/DiscoveryAdvertisement.java @@ -26,8 +26,8 @@ * prior written permission. For written permission, please contact * info@sbbi.net. * - * 5. Products derived from this software may not be called - * "SuperBonBon Industries", nor may "SBBI" appear in their name, + * 5. Products derived from this software may not be called + * "SuperBonBon Industries", nor may "SBBI" appear in their name, * without prior written permission of SuperBonBon Industries. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, @@ -42,7 +42,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * This software consists of voluntary contributions made by many individuals - * on behalf of SuperBonBon Industries. For more information on + * on behalf of SuperBonBon Industries. For more information on * SuperBonBon Industries, please see . */ package net.yacy.upnp; @@ -67,7 +67,7 @@ import org.apache.commons.logging.LogFactory; * The listener thread is set to only accept matching device description and broadcast message sender IP to * avoid a security flaw with the protocol. If you are not happy with such behaviour you can set the * net.yacy.upnp.ddos.matchip system property to false to avoid this check. - * + * * @author SuperBonBon * @version 1.0 */ @@ -123,7 +123,7 @@ public class DiscoveryAdvertisement implements Runnable /** * Registers an event category sent by UPNP devices - * + * * @param notificationEvent the event type, either DiscoveryAdvertisement.EVENT_SSDP_ALIVE or * DiscoveryAdvertisement.EVENT_SSDP_BYE_BYE * @param nt the type of device advertisement, upnp:rootdevice will return you all advertisement in @@ -162,7 +162,7 @@ public class DiscoveryAdvertisement implements Runnable /** * Unregisters an event category sent by UPNP devices - * + * * @param notificationEvent the event type, either DiscoveryAdvertisement.EVENT_SSDP_ALIVE or * DiscoveryAdvertisement.EVENT_SSDP_BYE_BYE * @param nt the type of device advertisement, upnp:rootdevice will unregister all advertisement in @@ -250,10 +250,11 @@ public class DiscoveryAdvertisement implements Runnable } catch ( SocketTimeoutException ex ) { // ignoring } catch ( IOException ioEx ) { - log.warn("IO Exception during UPNP DiscoveryAdvertisement messages listening thread"); + // fail silently + //log.warn("IO Exception during UPNP DiscoveryAdvertisement messages listening thread"); } catch ( Exception ex ) { - log - .warn("Fatal Error during UPNP DiscoveryAdvertisement messages listening thread, thread will exit"); + // fail silently + //log.warn("Fatal Error during UPNP DiscoveryAdvertisement messages listening thread, thread will exit"); this.inService = false; this.aliveRegistered.clear(); this.byeByeRegistered.clear(); From 8738336408c6a08dbe0ddb3d0076a6d0548cd16f Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 19 Jun 2012 08:45:49 +0200 Subject: [PATCH 4/6] set Xms lower than Xmx --- defaults/yacy.init | 2 +- htroot/PerformanceQueues_p.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults/yacy.init b/defaults/yacy.init index d94671b43..b09bed54f 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -621,7 +621,7 @@ cleanup.failedSearchURLtimeout = 86400000 # if a high performance for large search indexes is wanted, then setting the values to equal number is recommended # if YaCy shall be nice in not-only-yacy environments, then the Xms value may be lower javastart_Xmx=Xmx600m -javastart_Xms=Xms600m +javastart_Xms=Xms90m # YaCy is able to use RAM copies of database tables. This needs a lot of RAM. # To switch on copying of file tables int RAM, there must be enough memory diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java index aa71f767b..ce90ff105 100644 --- a/htroot/PerformanceQueues_p.java +++ b/htroot/PerformanceQueues_p.java @@ -84,9 +84,9 @@ public class PerformanceQueues_p { } } if (post.containsKey("Xmx")) { - int xmx = post.getInt("Xmx", 500); // default maximum heap size + int xmx = post.getInt("Xmx", 600); // default maximum heap size if (OS.isWin32) xmx = Math.min(2000, xmx); - int xms = xmx; // take all.. if this is not used the os will manage that. if not reserved at the beginning the OS may reject to give away more memory + int xms = Math.min(xmx, Math.max(90, xmx / 10)); sb.setConfig("javastart_Xmx", "Xmx" + xmx + "m"); sb.setConfig("javastart_Xms", "Xms" + xms + "m"); prop.put("setStartupCommit", "1"); @@ -342,9 +342,9 @@ public class PerformanceQueues_p { prop.put("priority_low",(curr_prio == 20) ? "1" : "0"); // parse initialization memory settings - final String Xmx = sb.getConfig("javastart_Xmx", "Xmx500m").substring(3); + final String Xmx = sb.getConfig("javastart_Xmx", "Xmx600m").substring(3); prop.put("Xmx", Xmx.substring(0, Xmx.length() - 1)); - final String Xms = sb.getConfig("javastart_Xms", "Xms500m").substring(3); + final String Xms = sb.getConfig("javastart_Xms", "Xms90m").substring(3); prop.put("Xms", Xms.substring(0, Xms.length() - 1)); final long diskFree = sb.getConfigLong(SwitchboardConstants.DISK_FREE, 3000L); From 15f4551d88c17f3fdbda04d4849b88f90c5113cf Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 19 Jun 2012 08:51:26 +0200 Subject: [PATCH 5/6] Release 1.03 --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index d5001cb52..b3ece00e2 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.6 javacTarget=1.6 # Release Configuration -releaseVersion=1.02 +releaseVersion=1.03 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz releaseFileParentDir=yacy From bea002dc15e9276e2c446123ba66fcef0489cd78 Mon Sep 17 00:00:00 2001 From: sixcooler Date: Tue, 19 Jun 2012 13:13:00 +0200 Subject: [PATCH 6/6] correct table in new look of Crawler_p --- htroot/Crawler_p.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htroot/Crawler_p.html b/htroot/Crawler_p.html index d480580f3..b9bc539ee 100644 --- a/htroot/Crawler_p.html +++ b/htroot/Crawler_p.html @@ -15,7 +15,7 @@ #%env/templates/submenuCrawlMonitor.template%#

Crawler

-
+
Queues