diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-12-03 19:34:56 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-12-03 19:34:56 -0300 |
| commit | 7208d8bc5e5f23d0773533b15763f64d236489b4 (patch) | |
| tree | b5af59cca307439653a3ed5a8ed1469c4b4af7fa | |
| parent | d103491cbc17e6e7422653e9b01101ff446e7391 (diff) | |
[feat] set default to False on batching for now
All batching code has no effect by default with this commit. Since we
know that this is a dangerous new feature we will enable them only on
our test servers and check them manually before setting it as default
or adding more configuration features.
Use SyncTarget and server conf file to enable it for testing.
| -rw-r--r-- | client/src/leap/soledad/client/http_target/send.py | 2 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/backend.py | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/client/src/leap/soledad/client/http_target/send.py b/client/src/leap/soledad/client/http_target/send.py index c1252c13..e8abf35b 100644 --- a/client/src/leap/soledad/client/http_target/send.py +++ b/client/src/leap/soledad/client/http_target/send.py @@ -29,7 +29,7 @@ class HTTPDocSender(object): They need to be encrypted and metadata prepared before sending. """ - MAX_BATCH_SIZE = 500 * 1000 # 500kB by default + MAX_BATCH_SIZE = 0 # disabled by now, this is being tested yet @defer.inlineCallbacks def _send_docs(self, docs_by_generation, last_known_generation, diff --git a/common/src/leap/soledad/common/backend.py b/common/src/leap/soledad/common/backend.py index 91f28fff..53426fb5 100644 --- a/common/src/leap/soledad/common/backend.py +++ b/common/src/leap/soledad/common/backend.py @@ -33,7 +33,7 @@ from leap.soledad.common.document import ServerDocument class SoledadBackend(CommonBackend): - BATCH_SUPPORT = True + BATCH_SUPPORT = False """ A U1DB backend implementation. diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 7320c133..39edcc1b 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -265,7 +265,7 @@ CONFIG_DEFAULTS = { 'couch_url': 'http://localhost:5984', 'create_cmd': None, 'admin_netrc': '/etc/couchdb/couchdb-admin.netrc', - 'batching': True + 'batching': False }, 'database-security': { 'members': ['soledad'], |