Skip to content

Z
Zope
Commit d5ce0a93 authored by Barry Warsaw's avatar Barry Warsaw
Browse files
Options

Refactoring. 

close(): The base class can now do all the work of closing, including
stopping the background threads.

log(): Much more convenient.
parent c6502e01
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 107 deletions
lib/python/BDBStorage/BDBFullStorage.py
View file @ d5ce0a93
......@@ -15,7 +15,7 @@
"""Berkeley storage with full undo and versioning support.
"""
__version__ = '$Revision: 1.54 $'.split()[-2:][0]
__version__ = '$Revision: 1.55 $'.split()[-2:][0]
import sys
import time
......@@ -33,7 +33,6 @@ from ZODB.utils import p64, U64
from ZODB.referencesf import referencesf
from ZODB.TimeStamp import TimeStamp
from ZODB.ConflictResolution import ConflictResolvingStorage, ResolvedSerial
import zLOG
# BerkeleyBase.BerkeleyBase class provides some common functionality for both
# the Full and Minimal implementations. It in turn inherits from
......@@ -296,24 +295,6 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
else:
self.__ltid = ZERO
def close(self):
# Set this flag before acquiring the lock so we don't block waiting
# for the autopack thread to give up the lock.
self._stop = True
self._lock_acquire()
try:
# We must stop the autopacker and checkpointing threads first
# before closing any tables. I'm not sure about the join()
# timeout, but I'd be surprised if any particular iteration of a
# pack-related loops take longer than a few seconds.
if self._autopacker:
zLOG.LOG('Full storage', zLOG.INFO, 'stopping autopack thread')
self._autopacker.stop()
self._autopacker.join(30)
BerkeleyBase.close(self)
finally:
self._lock_release()
def _doabort(self, txn, tid):
# First clean up the oid indexed (or oid+tid indexed) tables.
co = cs = ct = cv = None
......@@ -1350,7 +1331,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
# to pass that around to the helper methods, so just assert they're
# the same.
assert zreferencesf == referencesf
zLOG.LOG('Full storage', zLOG.INFO, 'classic pack started')
self.log('classic pack started')
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -1362,7 +1343,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
self._dopack(t)
finally:
self._packlock.release()
zLOG.LOG('Full storage', zLOG.INFO, 'classic pack finished')
self.log('classic pack finished')
def _dopack(self, t, gc=True):
# t is a TimeTime, or time float, convert this to a TimeStamp object,
......@@ -1420,9 +1401,8 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
Autopacking is different than classic pack() in that it doesn't do
cyclic garbage detection unless the gc flag is True.
"""
zLOG.LOG('Full storage', zLOG.INFO,
'autopack started (packtime: %s, gc? %s)'
% (t, gc and 'yes' or 'no'))
self.log('autopack started (packtime: %s, gc? %s)', t,
(gc and 'yes' or 'no'))
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -1434,7 +1414,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
self._dopack(t, gc)
finally:
self._packlock.release()
zLOG.LOG('Full storage', zLOG.INFO, 'autopack finished')
self.log('autopack finished')
def _collect_revs(self, txn, packtid):
ct = co = None
......
lib/python/BDBStorage/BDBMinimalStorage.py
View file @ d5ce0a93
......@@ -15,7 +15,7 @@
"""Berkeley storage without undo or versioning.
"""
__version__ = '$Revision: 1.17 $'[-2:][0]
__version__ = '$Revision: 1.18 $'[-2:][0]
import time
import threading
......@@ -29,7 +29,6 @@ from ZODB import POSException
from ZODB.utils import U64, p64
from ZODB.referencesf import referencesf
from ZODB.ConflictResolution import ConflictResolvingStorage, ResolvedSerial
import zLOG
# BerkeleyBase class provides some common functionality for BerkeleyDB-based
# storages. It in turn inherits from BaseStorage which itself provides some
......@@ -138,25 +137,6 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
self._autopacker = _Autopack(self, config.frequency)
self._autopacker.start()
def close(self):
# Set this flag before acquiring the lock so we don't block waiting
# for the autopack thread to give up the lock.
self._stop = True
self._lock_acquire()
try:
# We must stop the autopacker and checkpointing threads first
# before closing any tables. I'm not sure about the join()
# timeout, but I'd be surprised if any particular iteration of a
# pack-related loops take longer than a few seconds.
if self._autopacker:
zLOG.LOG('Minimal storage', zLOG.INFO,
'stopping autopack thread')
self._autopacker.stop()
self._autopacker.join(30)
BerkeleyBase.close(self)
finally:
self._lock_release()
def _doabort(self, txn, tid):
co = cs = None
try:
......@@ -377,7 +357,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
# to pass that around to the helper methods, so just assert they're
# the same.
assert zreferencesf == referencesf
zLOG.LOG('Minimal storage', zLOG.INFO, 'classic pack started')
self.log('classic pack started')
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -392,7 +372,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
self._dopack()
finally:
self._packlock.release()
zLOG.LOG('Minimal storage', zLOG.INFO, 'classic pack finished')
self.log('classic pack finished')
def _dopack(self):
# Do a mark and sweep for garbage collection. Calculate the set of
......
lib/python/BDBStorage/BerkeleyBase.py
View file @ d5ce0a93
......@@ -14,7 +14,7 @@
"""Base class for BerkeleyStorage implementations.
"""
__version__ = '$Revision: 1.25 $'.split()[-2:][0]
__version__ = '$Revision: 1.26 $'.split()[-2:][0]
import os
import time
......@@ -301,16 +301,36 @@ class BerkeleyBase(BaseStorage):
# performed by the methods in the derived storage class.
pass
def log(self, msg, *args):
zLOG.LOG(self.__class__.__name__, zLOG.INFO, msg % args)
def close(self):
"""Close the storage by closing the databases it uses and by closing
its environment.
"""Close the storage.
All background threads are stopped and joined first, then all the
tables are closed, and finally the environment is force checkpointed
and closed too.
"""
# Close all the tables
# Set this flag before acquiring the lock so we don't block waiting
# for the autopack thread to give up the lock.
self._stop = True
self._lock_acquire()
try:
self._doclose()
finally:
self._lock_release()
def _doclose(self):
# Stop the autopacker thread
if self._autopacker:
self.log('stopping autopacking thread')
self._autopacker.stop()
self._autopacker.join(SLEEP_TIME * 2)
if self._checkpointer:
zLOG.LOG('Full storage', zLOG.INFO,
'stopping checkpointing thread')
self.log('stopping checkpointing thread')
self._checkpointer.stop()
self._checkpointer.join(SLEEP_TIME * 2)
# Close all the tables
for d in self._tables:
d.close()
# As recommended by Keith Bostic @ Sleepycat, we need to do
......@@ -426,18 +446,18 @@ class _WorkThread(threading.Thread):
def run(self):
name = self._name
zLOG.LOG('Berkeley storage', zLOG.INFO, '%s thread started' % name)
self._storage.log('%s thread started', name)
while not self._stop:
now = time.time()
if now > self._nextcheck:
zLOG.LOG('Berkeley storage', zLOG.INFO, 'running %s' % name)
self._storage.log('running %s', name)
self._dowork(now)
self._nextcheck = now + self._interval
# Now we sleep for a little while before we check again. Sleep
# for the minimum of self._interval and SLEEP_TIME so as to be as
# responsive as possible to .stop() calls.
time.sleep(min(self._interval, SLEEP_TIME))
zLOG.LOG('Berkeley storage', zLOG.INFO, '%s thread finished' % name)
self._storage.log('%s thread finished', name)
def stop(self):
self._stop = True
......
lib/python/BDBStorage/Full.py
View file @ d5ce0a93
......@@ -15,7 +15,7 @@
"""Berkeley storage with full undo and versioning support.
"""
__version__ = '$Revision: 1.54 $'.split()[-2:][0]
__version__ = '$Revision: 1.55 $'.split()[-2:][0]
import sys
import time
......@@ -33,7 +33,6 @@ from ZODB.utils import p64, U64
from ZODB.referencesf import referencesf
from ZODB.TimeStamp import TimeStamp
from ZODB.ConflictResolution import ConflictResolvingStorage, ResolvedSerial
import zLOG
# BerkeleyBase.BerkeleyBase class provides some common functionality for both
# the Full and Minimal implementations. It in turn inherits from
......@@ -296,24 +295,6 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
else:
self.__ltid = ZERO
def close(self):
# Set this flag before acquiring the lock so we don't block waiting
# for the autopack thread to give up the lock.
self._stop = True
self._lock_acquire()
try:
# We must stop the autopacker and checkpointing threads first
# before closing any tables. I'm not sure about the join()
# timeout, but I'd be surprised if any particular iteration of a
# pack-related loops take longer than a few seconds.
if self._autopacker:
zLOG.LOG('Full storage', zLOG.INFO, 'stopping autopack thread')
self._autopacker.stop()
self._autopacker.join(30)
BerkeleyBase.close(self)
finally:
self._lock_release()
def _doabort(self, txn, tid):
# First clean up the oid indexed (or oid+tid indexed) tables.
co = cs = ct = cv = None
......@@ -1350,7 +1331,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
# to pass that around to the helper methods, so just assert they're
# the same.
assert zreferencesf == referencesf
zLOG.LOG('Full storage', zLOG.INFO, 'classic pack started')
self.log('classic pack started')
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -1362,7 +1343,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
self._dopack(t)
finally:
self._packlock.release()
zLOG.LOG('Full storage', zLOG.INFO, 'classic pack finished')
self.log('classic pack finished')
def _dopack(self, t, gc=True):
# t is a TimeTime, or time float, convert this to a TimeStamp object,
......@@ -1420,9 +1401,8 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
Autopacking is different than classic pack() in that it doesn't do
cyclic garbage detection unless the gc flag is True.
"""
zLOG.LOG('Full storage', zLOG.INFO,
'autopack started (packtime: %s, gc? %s)'
% (t, gc and 'yes' or 'no'))
self.log('autopack started (packtime: %s, gc? %s)', t,
(gc and 'yes' or 'no'))
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -1434,7 +1414,7 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
self._dopack(t, gc)
finally:
self._packlock.release()
zLOG.LOG('Full storage', zLOG.INFO, 'autopack finished')
self.log('autopack finished')
def _collect_revs(self, txn, packtid):
ct = co = None
......
lib/python/BDBStorage/Minimal.py
View file @ d5ce0a93
......@@ -15,7 +15,7 @@
"""Berkeley storage without undo or versioning.
"""
__version__ = '$Revision: 1.17 $'[-2:][0]
__version__ = '$Revision: 1.18 $'[-2:][0]
import time
import threading
......@@ -29,7 +29,6 @@ from ZODB import POSException
from ZODB.utils import U64, p64
from ZODB.referencesf import referencesf
from ZODB.ConflictResolution import ConflictResolvingStorage, ResolvedSerial
import zLOG
# BerkeleyBase class provides some common functionality for BerkeleyDB-based
# storages. It in turn inherits from BaseStorage which itself provides some
......@@ -138,25 +137,6 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
self._autopacker = _Autopack(self, config.frequency)
self._autopacker.start()
def close(self):
# Set this flag before acquiring the lock so we don't block waiting
# for the autopack thread to give up the lock.
self._stop = True
self._lock_acquire()
try:
# We must stop the autopacker and checkpointing threads first
# before closing any tables. I'm not sure about the join()
# timeout, but I'd be surprised if any particular iteration of a
# pack-related loops take longer than a few seconds.
if self._autopacker:
zLOG.LOG('Minimal storage', zLOG.INFO,
'stopping autopack thread')
self._autopacker.stop()
self._autopacker.join(30)
BerkeleyBase.close(self)
finally:
self._lock_release()
def _doabort(self, txn, tid):
co = cs = None
try:
......@@ -377,7 +357,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
# to pass that around to the helper methods, so just assert they're
# the same.
assert zreferencesf == referencesf
zLOG.LOG('Minimal storage', zLOG.INFO, 'classic pack started')
self.log('classic pack started')
# A simple wrapper around the bulk of packing, but which acquires a
# lock that prevents multiple packs from running at the same time.
self._packlock.acquire()
......@@ -392,7 +372,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
self._dopack()
finally:
self._packlock.release()
zLOG.LOG('Minimal storage', zLOG.INFO, 'classic pack finished')
self.log('classic pack finished')
def _dopack(self):
# Do a mark and sweep for garbage collection. Calculate the set of
......
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