From 3306ea69ee33cdafa8803f9c717b60b9f3d3b4a0 Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 25 Oct 2017 15:58:56 -0200 Subject: [feat] improve speed of server startup To avoid corrupting data, Soledad Server checks all user databases during startup to make sure all of them use the correct schema version. This was done synchronously, so when there are many databases startup would take a long time. This commit makes that verification asynchronous, thus speeding up server startup. --- tests/couch/test_state.py | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) (limited to 'tests/couch/test_state.py') diff --git a/tests/couch/test_state.py b/tests/couch/test_state.py index e5ac3704..673d9c41 100644 --- a/tests/couch/test_state.py +++ b/tests/couch/test_state.py @@ -1,14 +1,21 @@ +import mock import pytest + from leap.soledad.common.couch import CONFIG_DOC_ID from leap.soledad.common.couch import SCHEMA_VERSION from leap.soledad.common.couch import SCHEMA_VERSION_KEY -from leap.soledad.common.couch.state import CouchServerState +from leap.soledad.common.couch.state import _check_db_schema_version +from leap.soledad.common.couch.state import check_schema_versions from uuid import uuid4 from leap.soledad.common.errors import WrongCouchSchemaVersionError from leap.soledad.common.errors import MissingCouchConfigDocumentError from test_soledad.util import CouchDBTestCase +from twisted.internet import defer +from twisted.internet import reactor +from twisted.web.client import HTTPConnectionPool, Agent + class CouchDesignDocsTests(CouchDBTestCase): @@ -16,17 +23,43 @@ class CouchDesignDocsTests(CouchDBTestCase): CouchDBTestCase.setUp(self) self.db = self.couch_server.create('user-' + uuid4().hex) self.addCleanup(self.delete_db, self.db.name) + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.agent = Agent(reactor, pool=self.pool) + + @defer.inlineCallbacks + def tearDown(self): + yield self.pool.closeCachedConnections() - def test_wrong_couch_version_raises(self): + @defer.inlineCallbacks + def test__check_db_schema_version_wrong_schema_version_raises(self): wrong_schema_version = SCHEMA_VERSION + 1 self.db.create( {'_id': CONFIG_DOC_ID, SCHEMA_VERSION_KEY: wrong_schema_version}) with pytest.raises(WrongCouchSchemaVersionError): - CouchServerState(self.couch_url, create_cmd='/bin/echo', - check_schema_versions=True) + yield _check_db_schema_version( + self.couch_url, self.db.name, None, agent=self.agent) - def test_missing_config_doc_raises(self): + @defer.inlineCallbacks + def test_check_schema_versions_wrong_schema_version_stops_reactor(self): + wrong_schema_version = SCHEMA_VERSION + 1 + self.db.create( + {'_id': CONFIG_DOC_ID, SCHEMA_VERSION_KEY: wrong_schema_version}) + mocked_reactor = mock.Mock() + yield check_schema_versions( + self.couch_url, agent=self.agent, reactor=mocked_reactor) + self.assertTrue(mocked_reactor.stop.call_count == 1) + + @defer.inlineCallbacks + def test__check_db_schema_version_missing_config_doc_raises(self): self.db.create({}) with pytest.raises(MissingCouchConfigDocumentError): - CouchServerState(self.couch_url, create_cmd='/bin/echo', - check_schema_versions=True) + yield _check_db_schema_version( + self.couch_url, self.db.name, None, agent=self.agent) + + @defer.inlineCallbacks + def test_check_schema_versions_missing_config_doc_stops_reactor(self): + self.db.create({}) + mocked_reactor = mock.Mock() + yield check_schema_versions( + self.couch_url, agent=self.agent, reactor=mocked_reactor) + self.assertTrue(mocked_reactor.stop.call_count == 1) -- cgit v1.2.3