Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

reduce remote crawl PPM for fresh peers in freeworld to 6 PPM

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5124 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2008-09-08 09:49:08 +00:00
parent b92105c8b0
commit 3288c19c1a
8 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/yacy.init
View File

@ -559,9 +559,7 @@ performanceSpeed=100
50_localcrawl_memprereq=4194304
50_localcrawl_isPaused=false
60_remotecrawlloader_idlesleep=60000
60_remotecrawlloader_idlesleep__pro=10000
60_remotecrawlloader_busysleep=40000
60_remotecrawlloader_busysleep__pro=2000
60_remotecrawlloader_memprereq=2097152
60_remotecrawlloader_isPaused=false
62_remotetriggeredcrawl_idlesleep=10000

3
defaults/yacy.network.freeworld.unit
View File

@ -14,6 +14,7 @@ network.unit.search.time = 4
network.unit.dht = true
network.unit.dhtredundancy.junior = 1
network.unit.dhtredundancy.senior = 3
network.unit.remotecrawl.speed = 10
network.unit.bootstrap.seedlist0 = http://www.yacy.net/seed.txt
network.unit.bootstrap.seedlist1 = http://home.arcor.de/hermens/yacy/seed.txt
network.unit.bootstrap.seedlist2 = http://low.audioattack.de/yacy/seed.txt
@ -26,5 +27,5 @@ network.unit.update.location1 = http://latest.yacy.de
network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
network.unit.update.location3 = http://www.yacystats.de/yacybuild/
# properties for in-protocol response authentification:
# properties for in-protocol response authentication:
network.unit.protocol.control = uncontrolled

10
defaults/yacy.network.group
View File

@ -13,17 +13,17 @@
# network.group.description = <any string, just informal; appears in network graphic>
# network.group.administration.control = 'uncontrolled'|'moderated'|'controlled'
# network.group.administration.manager = <a .yacy or .yacyh - domain, naming the manager peer>
# network.group.administration.request.authentification.method = 'salted-magic'
# network.group.administration.request.authentification.essentials = <any string, a secret password>
# network.group.administration.request.authentication.method = 'salted-magic'
# network.group.administration.request.authentication.essentials = <any string, a secret password>
# -----------------------------------------------------------------#
# this is a work in progress. disabled properties are not yet used #
# -----------------------------------------------------------------#
# properties for group access administrator-authentification:
# properties for group access administrator-authentication:
#network.group.name = everybody
#network.group.description = Our Peer-Group
#network.group.administration.control = uncontrolled
#network.group.administration.manager =
#network.group.administration.request.authentification.method = salted-magic
#network.group.administration.request.authentification.essentials =
#network.group.administration.request.authentication.method = salted-magic
#network.group.administration.request.authentication.essentials =

3
defaults/yacy.network.intranet.unit
View File

@ -13,6 +13,7 @@ network.unit.domain = local
network.unit.dht = false
network.unit.dhtredundancy.junior = 1
network.unit.dhtredundancy.senior = 1
network.unit.remotecrawl.speed = 600
# each network may use different yacy distributions.
# the auto-updater can access network-specific update locations
@ -21,5 +22,5 @@ network.unit.update.location1 = http://latest.yacy.de
network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
network.unit.update.location3 = http://www.yacystats.de/yacybuild/
# properties for in-protocol response authentification:
# properties for in-protocol response authentication:
network.unit.protocol.control = uncontrolled

12
defaults/yacy.network.readme
View File

@ -34,11 +34,11 @@
# network.unit.dhtredundancy = <integer number, 0 means no DHT enabled>
# network.unit.bootstrap.seedlist<n> = <an url to a seedlists-file, which is stored by a principal peer>
# network.unit.protocol.control = 'uncontrolled'|'moderated'|'controlled'
# network.unit.protocol.request.authentification.method = 'salted-magic'
# network.unit.protocol.request.authentification.essentials = <any string, a secret password>
# network.unit.protocol.response.authentification.method = 'challenge-pwresponse'
# network.unit.protocol.response.authentification.essentials = <a challenge string>':'<a secret response-string>
# network.unit.protocol.request.authentication.method = 'salted-magic'
# network.unit.protocol.request.authentication.essentials = <any string, a secret password>
# network.unit.protocol.response.authentication.method = 'challenge-pwresponse'
# network.unit.protocol.response.authentication.essentials = <a challenge string>':'<a secret response-string>
# network.unit.administration.control = 'uncontrolled'|'moderated'|'controlled'
# network.unit.administration.manager = <a .yacy or .yacyh - domain, naming the manager peer>
# network.unit.administration.request.authentification.method = 'salted-magic'
# network.unit.administration.request.authentification.essentials = <any string, a secret password>
# network.unit.administration.request.authentication.method = 'salted-magic'
# network.unit.administration.request.authentication.essentials = <any string, a secret password>

3
defaults/yacy.network.webportal.unit
View File

@ -10,6 +10,7 @@ network.unit.search.time = 4
network.unit.dht = false
network.unit.dhtredundancy.junior = 1
network.unit.dhtredundancy.senior = 1
network.unit.remotecrawl.speed = 1
# each network may use different yacy distributions.
# the auto-updater can access network-specific update locations
@ -18,5 +19,5 @@ network.unit.update.location1 = http://latest.yacy.de
network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
network.unit.update.location3 = http://www.yacystats.de/yacybuild/
# properties for in-protocol response authentification:
# properties for in-protocol response authentication:
network.unit.protocol.control = uncontrolled

9
source/de/anomic/plasma/plasmaSwitchboard.java
View File

@ -298,6 +298,15 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
(int) getConfigLong(plasmaSwitchboardConstants.WORDCACHE_MAX_COUNT, 20000));
setConfig(plasmaSwitchboardConstants.WORDCACHE_MAX_COUNT, Integer.toString(wordCacheMaxCount));
// set network-specific performance attributes
if (this.firstInit) {
int remotecrawl_ppm = Math.max(1, (int) getConfigLong("network.unit.remotecrawl.speed", 60));
setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, 60000 / remotecrawl_ppm);
setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_IDLESLEEP, Math.max(10000, 180000 / remotecrawl_ppm));
setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_BUSYSLEEP, Math.max(15000, 1800000 / remotecrawl_ppm));
setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_IDLESLEEP, Math.max(30000, 3600000 / remotecrawl_ppm));
}
// start indexing management
log.logConfig("Starting Indexing Management");
final String networkName = getConfig("network.unit.name", "");

2
source/de/anomic/server/serverAbstractSwitch.java
View File

@ -41,6 +41,7 @@ public abstract class serverAbstractSwitch<E> implements serverSwitch<E> {
private final File configFile;
private final String configComment;
private final File rootPath;
protected boolean firstInit;
protected serverLog log;
protected int serverJobs;
protected long maxTrackingTime;
@ -64,6 +65,7 @@ public abstract class serverAbstractSwitch<E> implements serverSwitch<E> {
this.configComment = "This is an automatically generated file, updated by serverAbstractSwitch and initialized by " + initPath;
final File initFile = new File(rootPath, initPath);
this.configFile = new File(rootPath, configPath); // propertiesFile(config);
firstInit = !configFile.exists(); // this is true if the application was started for the first time
new File(configFile.getParent()).mkdir();
// predefine init's