Skip to content

Z
Zope
Commit 4babe9e1 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Reverted changes in rev r24514 that broke mount points. 

Made a small fix to _setDB in Mount.py to pass 
through new args passed to it.

With these changes, Zope now runs again.
parent 7f8def24
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 84 deletions
lib/python/DBTab/ClassFactories.py
View file @ 4babe9e1
......@@ -75,16 +75,12 @@ def autoClassFactory(jar, module, name):
"""
# If not the root connection, use the class factory from
# the root database, otherwise use the Zope class factory.
# The default Zope configuration installs this function as the DB
# class's classFactory() method.
root_conn = getattr(jar, '_root_connection', None)
if root_conn is not jar:
root_db = getattr(root_conn, '_db', None)
if root_db is not None:
return root_db.classFactory(root_conn, module, name)
return zopeClassFactory(jar, module, name)
root_db = getattr(root_conn, '_db', None)
if root_db is not None:
return root_db.classFactory(root_conn, module, name)
else:
return zopeClassFactory(jar, module, name)
class_factories['auto'] = autoClassFactory
lib/python/OFS/Application.py
View file @ 4babe9e1
......@@ -14,6 +14,7 @@
$Id$
"""
import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_
import time, traceback, os, Products
from DateTime import DateTime
......@@ -323,10 +324,10 @@ class AppInitializer:
def install_tempfolder_and_sdc(self):
app = self.getApp()
from Products.ZODBMountPoint.MountedObject \
import manage_addMounts, MountedObject
from Products.ZODBMountPoint.MountedObject \
import getConfiguration as getDBTabConfiguration
from Products.ZODBMountPoint.MountedObject import manage_addMounts,\
MountedObject
from Products.ZODBMountPoint.MountedObject import getConfiguration as \
getDBTabConfiguration
dbtab_config = getDBTabConfiguration()
......
lib/python/Products/ZODBMountPoint/Mount.py
View file @ 4babe9e1
......@@ -28,16 +28,13 @@ import Persistence, Acquisition
from Acquisition import aq_base
from ZODB.POSException import MountedStorageError
from ZODB.DB import DB
from ZODB.Connection import Connection
LOG = getLogger('Zope.ZODBMountPoint')
class MountPoint(Persistence.Persistent, Acquisition.Implicit):
"""An object that accesses a different database when traversed.
This class is intended to be used as a base class.
"""
'''The base class for a Zope object which, when traversed,
accesses a different database.
'''
# Default values for non-persistent variables.
_v_data = None # An object in an open connection
......@@ -47,19 +44,23 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit):
self.id = id
def _getDB(self):
"""Hook for getting the DB object for this mount point."""
"""Hook for getting the DB object for this mount point.
"""
raise NotImplementedError
def _getDBName(self):
"""Hook for getting the name of the database for this mount point."""
"""Hook for getting the name of the database for this mount point.
"""
raise NotImplementedError
def _getRootDBName(self):
"""Hook for getting the name of the root database."""
"""Hook for getting the name of the root database.
"""
raise NotImplementedError
def _traverseToMountedRoot(self, root, mount_parent):
"""Hook for getting the object to be mounted."""
"""Hook for getting the object to be mounted.
"""
raise NotImplementedError
def __repr__(self):
......@@ -122,13 +123,20 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit):
def _test(self, parent):
"""Tests the database connection."""
'''Tests the database connection.
'''
self._getOrOpenObject(parent)
return 1
def _logConnectException(self):
"""Records info about the exception that just occurred."""
'''Records info about the exception that just occurred.
'''
try:
from cStringIO import StringIO
except:
from StringIO import StringIO
import traceback
exc = sys.exc_info()
LOG.error('Failed to mount database. %s (%s)' % exc[:2], exc_info=exc)
f=StringIO()
......@@ -136,73 +144,85 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit):
self._v_connect_error = (exc[0], exc[1], f.getvalue())
exc = None
class MountConnection(Connection):
"""Subclass of Connection that supports mounts."""
# XXX perhaps the code in this subclass should be folded into
# ZODB proper.
def __init__(self, **kwargs):
Connection.__init__(self, **kwargs)
# The _root_connection of the actual root points to self. All
# other connections will have _root_connection over-ridden in
# _addMountedConnection().
self._root_connection = self
self._mounted_connections = {}
class ConnectionPatches:
# Changes to Connection.py that might fold into ZODB
_root_connection = None
_mounted_connections = None
def _getRootConnection(self):
return self._root_connection
root_conn = self._root_connection
if root_conn is None:
return self
else:
return root_conn
def _getMountedConnection(self, name):
return self._root_connection._mounted_connections.get(name)
conns = self._getRootConnection()._mounted_connections
if conns is None:
return None
else:
return conns.get(name)
def _addMountedConnection(self, name, conn):
if conn._root_connection is not conn:
raise ValueError("Connection %s is already mounted" % repr(conn))
conns = self._root_connection._mounted_connections
if name in conns:
raise KeyError("A connection named %s already exists" % repr(name))
conn._root_connection = self._root_connection
if conn._root_connection is not None:
raise ValueError, 'Connection %s is already mounted' % repr(conn)
root_conn = self._getRootConnection()
conns = root_conn._mounted_connections
if conns is None:
conns = {}
root_conn._mounted_connections = conns
if conns.has_key(name):
raise KeyError, 'A connection named %s already exists' % repr(name)
conn._root_connection = root_conn
conns[name] = conn
def _setDB(self, odb, **kwargs):
Connection._setDB(self, odb, **kwargs)
for conn in self._mounted_connections.values():
conn._setDB(odb, **kwargs)
def _setDB(self, odb, *args, **kw):
self._real_setDB(odb, *args, **kw)
conns = self._mounted_connections
if conns:
for conn in conns.values():
conn._setDB(conn._db, *args, **kw)
def close(self):
if self._root_connection is not self:
if self._root_connection is not None:
raise RuntimeError("Should not close mounted connections directly")
# The code here duplicates much of the code in
# DB._closeConnection and Connection.close. A mounted
# connection can't operate independently, so we don't call
# DB._closeConnection(), which would return it to the
# connection pool; only the root connection should be
# returned.
for conn in self._mounted_connections.values():
# DB._closeConnection calls the activity monitor
am = conn._db.getActivityMonitor()
am.closedConnection(conn)
# Connection.close does GC
conn._cache.incrgc()
conn._storage = conn._tmp = conn.new_oid = conn._opened = None
conn._debug_info = ()
# The mounted connection keeps a reference to
# its database, but nothing else.
conns = self._mounted_connections
if conns:
for conn in conns.values():
# Notify the activity monitor
db = conn.db()
f = getattr(db, 'getActivityMonitor', None)
if f is not None:
am = f()
if am is not None:
am.closedConnection(conn)
conn.cacheGC() # This is a good time to do some GC
# XXX maybe we ought to call the close callbacks.
conn._storage = conn._tmp = conn.new_oid = conn._opened = None
conn._debug_info = ()
# The mounted connection keeps a reference to
# its database, but nothing else.
# Note that mounted connections can not operate
# independently, so don't use _closeConnection() to
# return them to the pool. Only the root connection
# should be returned.
# Close this connection only after the mounted connections
# have been closed. Otherwise, this connection gets returned
# to the pool too early and another thread might use this
# connection before the mounted connections have all been
# closed.
Connection.close(self)
# Replace the default database Connection
def install():
DB.klass = MountConnection
# XXX This shouldn't be done as a side-effect of import, but it's not
# clear where in the Zope initialization code it should be done.
install()
self._real_close()
if 1:
# patch Connection.py.
from ZODB.Connection import Connection
Connection._real_setDB = Connection._setDB
Connection._real_close = Connection.close
for k, v in ConnectionPatches.__dict__.items():
if not k.startswith('__'):
setattr(Connection, k, v)
lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
View file @ 4babe9e1
......@@ -22,9 +22,7 @@ import ZODB
from OFS.Application import Application
from OFS.Folder import Folder
import App.config
from Products.ZODBMountPoint.MountedObject \
import manage_addMounts, getMountPoint
from Products.ZODBMountPoint.Mount import MountConnection
from Products.ZODBMountPoint.MountedObject import manage_addMounts, getMountPoint
from DBTab.DBTab import DBTab
try:
......@@ -38,7 +36,7 @@ class TestDBConfig:
self.mpoints = mpoints
def getDB(self):
from ZODB.config import MappingStorage
from ZODB.config import DemoStorage
from ZODB.Connection import Connection
from Zope.Startup.datatypes import ZopeDatabase
self.name = self.fname
......@@ -52,9 +50,9 @@ class TestDBConfig:
self.version_pool_size = 3
self.version_cache_size = 100
self.mount_points = self.mpoints
self.connection_class = MountConnection
self.connection_class = Connection
self.class_factory = None
self.storage = MappingStorage(self)
self.storage = DemoStorage(self)
self.container_class = None
return ZopeDatabase(self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7