Increase the stored value redundancy to 6.

diff --git a/apt-p2p.conf b/apt-p2p.conf
index 6698d835772b2a22df987c921bc002293f33734b..6d4a00fd985ad7e31c10c555aaf85954b08cbe3d 100644 (file)
--- a/apt-p2p.conf
+++ b/apt-p2p.conf
@@ -86,7 +86,7 @@ CHECKPOINT_INTERVAL = 5m
 CONCURRENT_REQS = 8
 
 # how many hosts to post values to
-STORE_REDUNDANCY = 3
+STORE_REDUNDANCY = 6
 
 # How many values to attempt to retrieve from the DHT.
 # Setting this to 0 will try and get all values (which could take a while if

diff --git a/apt_p2p/apt_p2p_conf.py b/apt_p2p/apt_p2p_conf.py
index 98beae7fa237014f39d2372019c6481cf82aaa93..09d598b4e84b0504c9cbf9ac0a6ba99cd62a5983 100644 (file)
--- a/apt_p2p/apt_p2p_conf.py
+++ b/apt_p2p/apt_p2p_conf.py
@@ -100,7 +100,7 @@ DHT_DEFAULTS = {
     'CONCURRENT_REQS': '8',
     
     # how many hosts to post to
-    'STORE_REDUNDANCY': '3',
+    'STORE_REDUNDANCY': '6',
     
     # How many values to attempt to retrieve from the DHT.
     # Setting this to 0 will try and get all values (which could take a while if

diff --git a/apt_p2p_Khashmir/DHT.py b/apt_p2p_Khashmir/DHT.py
index 4280f17c3e89a4e1cd9f376af7750acc0e685390..a28a1e9ac683834327251a17bb234d7d6630eaab 100644 (file)
--- a/apt_p2p_Khashmir/DHT.py
+++ b/apt_p2p_Khashmir/DHT.py
@@ -334,7 +334,7 @@ class TestSimpleDHT(unittest.TestCase):
     timeout = 50
     DHT_DEFAULTS = {'PORT': 9977,
                     'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8,
-                    'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000,
+                    'STORE_REDUNDANCY': 6, 'RETRIEVE_VALUES': -10000,
                     'MAX_FAILURES': 3, 'LOCAL_OK': True,
                     'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
                     'KRPC_TIMEOUT': 9, 'KRPC_INITIAL_DELAY': 2,
@@ -455,7 +455,7 @@ class TestMultiDHT(unittest.TestCase):
     num = 20
     DHT_DEFAULTS = {'PORT': 9977,
                     'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8,
-                    'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000,
+                    'STORE_REDUNDANCY': 6, 'RETRIEVE_VALUES': -10000,
                     'MAX_FAILURES': 3, 'LOCAL_OK': True,
                     'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
                     'KRPC_TIMEOUT': 9, 'KRPC_INITIAL_DELAY': 2,

diff --git a/apt_p2p_Khashmir/khashmir.py b/apt_p2p_Khashmir/khashmir.py
index f083da4763dc25f5a96fea8b50be9ca7488a89a7..d3ee9ee847add5031a9067ce5b3fd1e123bb8c5f 100644 (file)
--- a/apt_p2p_Khashmir/khashmir.py
+++ b/apt_p2p_Khashmir/khashmir.py
@@ -560,7 +560,7 @@ class SimpleTests(unittest.TestCase):
     timeout = 10
     DHT_DEFAULTS = {'PORT': 9977,
                     'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8,
-                    'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000,
+                    'STORE_REDUNDANCY': 6, 'RETRIEVE_VALUES': -10000,
                     'MAX_FAILURES': 3, 'LOCAL_OK': True,
                     'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
                     'KRPC_TIMEOUT': 9, 'KRPC_INITIAL_DELAY': 2,
@@ -634,7 +634,7 @@ class MultiTest(unittest.TestCase):
     num = 20
     DHT_DEFAULTS = {'PORT': 9977,
                     'CHECKPOINT_INTERVAL': 300, 'CONCURRENT_REQS': 8,
-                    'STORE_REDUNDANCY': 3, 'RETRIEVE_VALUES': -10000,
+                    'STORE_REDUNDANCY': 6, 'RETRIEVE_VALUES': -10000,
                     'MAX_FAILURES': 3, 'LOCAL_OK': True,
                     'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
                     'KRPC_TIMEOUT': 9, 'KRPC_INITIAL_DELAY': 2,

diff --git a/debian/apt-p2p.conf.sgml b/debian/apt-p2p.conf.sgml
index 793c1cd6659b5fa9f8fd402f8492cd8d3be7472a..288864ec17f14d1d92d50ec8f0878a4f65b7fa3a 100644 (file)
--- a/debian/apt-p2p.conf.sgml
+++ b/debian/apt-p2p.conf.sgml
@@ -227,7 +227,7 @@
            <term><option>STORE_REDUNDANCY = <replaceable>number</replaceable></option></term>
             <listitem>
              <para>The <replaceable>number</replaceable> of redundant copies of a value to store in the DHT.
-                 (Default is 3.)</para>
+                 (Default is 6.)</para>
            </listitem>
          </varlistentry>
          <varlistentry>

diff --git a/test.py b/test.py
index 566b4b35b0a407f64c5aed310888c730167d2328..ac7892ad7cbae233e00b8a94bdd79ac82b4bf4ff 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -494,7 +494,7 @@ CHECKPOINT_INTERVAL = 5m
 CONCURRENT_REQS = 8
 
 # how many hosts to post to
-STORE_REDUNDANCY = 3
+STORE_REDUNDANCY = 6
 
 # How many values to attempt to retrieve from the DHT.
 # Setting this to 0 will try and get all values (which could take a while if