From a5dd904be839e2b2896483724d6238b5a970b5de Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Fri, 9 May 2008 15:16:46 -0700 Subject: [PATCH 1/1] Increase the concurrency of DHT requests to 8. --- apt-p2p.conf | 2 +- apt_p2p/apt_p2p_conf.py | 2 +- apt_p2p_Khashmir/DHT.py | 4 ++-- apt_p2p_Khashmir/khashmir.py | 4 ++-- debian/apt-p2p.conf.sgml | 2 +- test.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apt-p2p.conf b/apt-p2p.conf index 1031d1e..6698d83 100644 --- a/apt-p2p.conf +++ b/apt-p2p.conf @@ -83,7 +83,7 @@ BOOTSTRAP_NODE = no CHECKPOINT_INTERVAL = 5m # concurrent number of calls per find node/value request! -CONCURRENT_REQS = 4 +CONCURRENT_REQS = 8 # how many hosts to post values to STORE_REDUNDANCY = 3 diff --git a/apt_p2p/apt_p2p_conf.py b/apt_p2p/apt_p2p_conf.py index 8e6f274..98beae7 100644 --- a/apt_p2p/apt_p2p_conf.py +++ b/apt_p2p/apt_p2p_conf.py @@ -97,7 +97,7 @@ DHT_DEFAULTS = { ### SEARCHING/STORING # concurrent xmlrpc calls per find node/value request! - 'CONCURRENT_REQS': '4', + 'CONCURRENT_REQS': '8', # how many hosts to post to 'STORE_REDUNDANCY': '3', diff --git a/apt_p2p_Khashmir/DHT.py b/apt_p2p_Khashmir/DHT.py index af24730..4280f17 100644 --- a/apt_p2p_Khashmir/DHT.py +++ b/apt_p2p_Khashmir/DHT.py @@ -333,7 +333,7 @@ class TestSimpleDHT(unittest.TestCase): timeout = 50 DHT_DEFAULTS = {'PORT': 9977, - 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 4, + 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8, 'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000, 'MAX_FAILURES': 3, 'LOCAL_OK': True, 'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600, @@ -454,7 +454,7 @@ class TestMultiDHT(unittest.TestCase): timeout = 100 num = 20 DHT_DEFAULTS = {'PORT': 9977, - 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 4, + 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8, 'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000, 'MAX_FAILURES': 3, 'LOCAL_OK': True, 'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600, diff --git a/apt_p2p_Khashmir/khashmir.py b/apt_p2p_Khashmir/khashmir.py index c89870e..f083da4 100644 --- a/apt_p2p_Khashmir/khashmir.py +++ b/apt_p2p_Khashmir/khashmir.py @@ -559,7 +559,7 @@ class SimpleTests(unittest.TestCase): timeout = 10 DHT_DEFAULTS = {'PORT': 9977, - 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 4, + 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8, 'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000, 'MAX_FAILURES': 3, 'LOCAL_OK': True, 'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600, @@ -633,7 +633,7 @@ class MultiTest(unittest.TestCase): timeout = 30 num = 20 DHT_DEFAULTS = {'PORT': 9977, - 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 4, + 'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8, 'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000, 'MAX_FAILURES': 3, 'LOCAL_OK': True, 'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600, diff --git a/debian/apt-p2p.conf.sgml b/debian/apt-p2p.conf.sgml index 47d4547..793c1cd 100644 --- a/debian/apt-p2p.conf.sgml +++ b/debian/apt-p2p.conf.sgml @@ -220,7 +220,7 @@ The concurrent number of calls per find node/value request. - (Default is 4.) + (Default is 8.) diff --git a/test.py b/test.py index 1abbe3a..566b4b3 100755 --- a/test.py +++ b/test.py @@ -491,7 +491,7 @@ BOOTSTRAP_NODE = %(BOOTSTRAP_NODE)s CHECKPOINT_INTERVAL = 5m # concurrent xmlrpc calls per find node/value request! -CONCURRENT_REQS = 4 +CONCURRENT_REQS = 8 # how many hosts to post to STORE_REDUNDANCY = 3 -- 2.30.2