Increase the concurrency of DHT requests to 8.

diff --git a/apt-p2p.conf b/apt-p2p.conf
index 1031d1ea2c72126f1f773c18ba83f071c8288733..6698d835772b2a22df987c921bc002293f33734b 100644 (file)
--- 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!
 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
 
 # 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 8e6f27417d1e10a30f8110702db8533ae2cc8310..98beae7fa237014f39d2372019c6481cf82aaa93 100644 (file)
--- 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!
     
     ### 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',
     
     # how many hosts to post to
     'STORE_REDUNDANCY': '3',

diff --git a/apt_p2p_Khashmir/DHT.py b/apt_p2p_Khashmir/DHT.py
index af247302f9ed6dc0b3838bbef09d2ebf681d54f8..4280f17c3e89a4e1cd9f376af7750acc0e685390 100644 (file)
--- 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,
     
     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,
                     '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,
     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,
                     '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 c89870e86c88d56ce2713c99c6e6bcd2bacc80cf..f083da4763dc25f5a96fea8b50be9ca7488a89a7 100644 (file)
--- 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,
     
     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,
                     '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,
     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,
                     '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 47d4547a619b9bed21202ad6561e125204e5a3e2..793c1cd6659b5fa9f8fd402f8492cd8d3be7472a 100644 (file)
--- a/debian/apt-p2p.conf.sgml
+++ b/debian/apt-p2p.conf.sgml
@@ -220,7 +220,7 @@
            <term><option>CONCURRENT_REQS = <replaceable>number</replaceable></option></term>
             <listitem>
              <para>The concurrent <replaceable>number</replaceable> of calls per find node/value request.
            <term><option>CONCURRENT_REQS = <replaceable>number</replaceable></option></term>
             <listitem>
              <para>The concurrent <replaceable>number</replaceable> of calls per find node/value request.

-                 (Default is 4.)</para>
+                 (Default is 8.)</para>

            </listitem>
          </varlistentry>
          <varlistentry>
            </listitem>
          </varlistentry>
          <varlistentry>

diff --git a/test.py b/test.py
index 1abbe3a5067ae1a302a15e08f9222441a6ea34a8..566b4b35b0a407f64c5aed310888c730167d2328 100755 (executable)
--- 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!
 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
 
 # how many hosts to post to
 STORE_REDUNDANCY = 3