Revert b2693ea

config-zodb.json

@@ -3,7 +3,7 @@
 		{
 		"zodb1": {
 			"storage": "ZODB",
-			"path": "data/zeo.fs",
+			"path": "data/Data.fs",
 			"configuration": {
                 "pool_size": 100,
                 "cache_size": 100

src/plone.server/plone/server/factory.py

@@ -335,14 +335,9 @@ def make_app(config_file=None, settings=None):
                 fs = ZODB.FileStorage.FileStorage(dbconfig['path'])
 
                 db = DB(fs)
-                try:
-                    if not IDataBase.providedBy(root):
-                        alsoProvides(db.open().root(), IDataBase)
-                    transaction.commit()
-                except:
-                    pass
-                finally:
-                    db.close()
+                alsoProvides(db.open().root(), IDataBase)
+                transaction.commit()
+                db.close()
                 # Set request aware database for app
                 db = RequestAwareDB(dbconfig['path'], **config)
                 dbo = DataBase(key, db)
@@ -352,14 +347,10 @@ def make_app(config_file=None, settings=None):
 
                 cs = ClientStorage(address)
                 db = DB(cs)
-                try:
-                    if not IDataBase.providedBy(root):
-                        alsoProvides(db.open().root(), IDataBase)
-                    transaction.commit()
-                except:
-                    pass
-                finally:
-                    db.close()
+
+                alsoProvides(db.open().root(), IDataBase)
+                transaction.commit()
+                db.close()
 
                 # Set request aware database for app
                 cs = ClientStorage(address)
@@ -368,9 +359,7 @@ def make_app(config_file=None, settings=None):
             elif dbconfig['storage'] == 'DEMO':
                 storage = DemoStorage(name=dbconfig['name'])
                 db = DB(storage)
-                root = db.open().root()
-                if not IDataBase.providedBy(root):
-                    alsoProvides(db.open().root(), IDataBase)
+                alsoProvides(db.open().root(), IDataBase)
                 transaction.commit()
                 db.close()
                 # Set request aware database for app

src/plone.server/plone/server/transactions.py

@@ -187,7 +187,7 @@ def savepoint(self):
 
 
 class RequestAwareConnection(ZODB.Connection.Connection):
-    executor = ThreadPoolExecutor(max_workers=1)
+    executor = ThreadPoolExecutor(max_workers=100)
     lock = threading.Lock()
 
     def _getReadCurrent(self):

src/plone.server/plone/server/traversal.py

@@ -190,20 +190,11 @@ async def handler(self, request):
                 async with locked(self.resource):
                     view_result = await self.view()
                     if isinstance(view_result, ErrorResponse):
-                        if SHARED_CONNECTION is False:
-                            txn.abort()
-                        else:
-                            await sync(request)(txn.abort)
+                        await sync(request)(txn.abort)
                     elif isinstance(view_result, UnauthorizedResponse):
-                        if SHARED_CONNECTION is False:
-                            txn.abort()
-                        else:
-                            await sync(request)(txn.abort)
+                        await sync(request)(txn.abort)
                     else:
-                        if SHARED_CONNECTION is False:
-                            txn.commit()
-                        else:
-                            await sync(request)(txn.commit)
+                        await sync(request)(txn.commit)
             except Unauthorized:
                 await sync(request)(txn.abort)
                 view_result = UnauthorizedResponse(