[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 28685 from 3.3 branch.
Tim Peters
tim.one at comcast.net
Wed Dec 22 12:05:09 EST 2004
Log message for revision 28686:
Merge rev 28685 from 3.3 branch.
Collector 1536: ClientStorage.__init__ ignores cache_size.
Also split test checkRollover into two tests,
checkDisconnectedCacheWorks (persistent ZEO cache large enough
to satisfy all requests) and checkDisconnectedCacheFails (cache
too small to satisfy all requests while disconnected).
Changed:
U ZODB/trunk/NEWS.txt
U ZODB/trunk/src/ZEO/ClientStorage.py
U ZODB/trunk/src/ZEO/cache.py
U ZODB/trunk/src/ZEO/tests/ConnectionTests.py
-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt 2004-12-22 17:03:05 UTC (rev 28685)
+++ ZODB/trunk/NEWS.txt 2004-12-22 17:05:09 UTC (rev 28686)
@@ -58,6 +58,12 @@
ZEO client cache
----------------
+- Collector 1536: The ``cache-size`` configuration option for ZEO clients
+ was being ignored. Worse, the client cache size was only one megabyte,
+ much smaller than the advertised default of 20MB. Note that the default
+ is carried over from a time when gigabyte disks were expensive and rare;
+ 20MB is also too small on most modern machines.
+
- Fixed a bug wherein an object removed from the client cache didn't
properly mark the file slice it occupied as being available for reuse.
Modified: ZODB/trunk/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/trunk/src/ZEO/ClientStorage.py 2004-12-22 17:03:05 UTC (rev 28685)
+++ ZODB/trunk/src/ZEO/ClientStorage.py 2004-12-22 17:05:09 UTC (rev 28686)
@@ -309,7 +309,7 @@
cache_path = os.path.join(dir, "%s-%s.zec" % (client, storage))
else:
cache_path = None
- self._cache = self.ClientCacheClass(cache_path)
+ self._cache = self.ClientCacheClass(cache_path, size=cache_size)
# XXX When should it be opened?
self._cache.open()
Modified: ZODB/trunk/src/ZEO/cache.py
===================================================================
--- ZODB/trunk/src/ZEO/cache.py 2004-12-22 17:03:05 UTC (rev 28685)
+++ ZODB/trunk/src/ZEO/cache.py 2004-12-22 17:05:09 UTC (rev 28686)
@@ -72,7 +72,11 @@
# @param path path of persistent snapshot of cache state (a file path)
# @param size size of cache file, in bytes
- def __init__(self, path=None, size=None, trace=False):
+ # The default size of 200MB makes a lot more sense than the traditional
+ # default of 20MB. The default here is misleading, though, since
+ # ClientStorage is the only user of ClientCache, and it always passes an
+ # explicit size of its own choosing.
+ def __init__(self, path=None, size=200*1024**2, trace=False):
self.path = path
self.size = size
@@ -105,7 +109,7 @@
# A FileCache instance does all the low-level work of storing
# and retrieving objects to/from the cache file.
- self.fc = FileCache(size or 10**6, self.path, self)
+ self.fc = FileCache(size, self.path, self)
def open(self):
self.fc.scan(self.install)
@@ -693,7 +697,6 @@
# file that exists, that pre-existing file is used (persistent
# cache). In all other cases a new file is created: a temp
# file if fpath is None, else with path fpath.
- assert maxsize >= 1000 # although 1000 is still absurdly low
self.maxsize = maxsize
self.parent = parent
@@ -879,7 +882,7 @@
# freed (starting at currentofs when _makeroom returns, and
# spanning the number of bytes retured by _makeroom).
def _makeroom(self, nbytes):
- assert 0 < nbytes <= self.maxsize
+ assert 0 < nbytes <= self.maxsize - ZEC3_HEADER_SIZE
if self.currentofs + nbytes > self.maxsize:
self.currentofs = ZEC3_HEADER_SIZE
ofs = self.currentofs
Modified: ZODB/trunk/src/ZEO/tests/ConnectionTests.py
===================================================================
--- ZODB/trunk/src/ZEO/tests/ConnectionTests.py 2004-12-22 17:03:05 UTC (rev 28685)
+++ ZODB/trunk/src/ZEO/tests/ConnectionTests.py 2004-12-22 17:05:09 UTC (rev 28686)
@@ -418,24 +418,51 @@
self.assertEqual(revid1, revid2)
self._storage.close()
- def checkRollover(self):
- # Check that the cache works when the files are swapped.
+ def checkDisconnectedCacheWorks(self):
+ # Check that the cache works when the client is disconnected.
+ self._storage = self.openClientStorage('test')
+ oid1 = self._storage.new_oid()
+ obj1 = MinPO("1" * 500)
+ self._dostore(oid1, data=obj1)
+ oid2 = self._storage.new_oid()
+ obj2 = MinPO("2" * 500)
+ self._dostore(oid2, data=obj2)
+ expected1 = self._storage.load(oid1, '')
+ expected2 = self._storage.load(oid2, '')
- # In this case, only one object fits in a cache file. When the
- # cache files swap, the first object is effectively uncached.
+ # Shut it all down, and try loading from the persistent cache file
+ # without a server present.
+ self._storage.close()
+ self.shutdownServer()
+ self._storage = self.openClientStorage('test', wait=False)
+ self.assertEqual(expected1, self._storage.load(oid1, ''))
+ self.assertEqual(expected2, self._storage.load(oid2, ''))
+ self._storage.close()
- self._storage = self.openClientStorage('test', 1000)
+ def checkDisconnectedCacheFails(self):
+ # Like checkDisconnectedCacheWorks above, except the cache
+ # file is so small that only one object can be remembered.
+ self._storage = self.openClientStorage('test', cache_size=900)
oid1 = self._storage.new_oid()
obj1 = MinPO("1" * 500)
self._dostore(oid1, data=obj1)
oid2 = self._storage.new_oid()
obj2 = MinPO("2" * 500)
+ # The cache file is so small that adding oid2 will evict oid1.
self._dostore(oid2, data=obj2)
+ expected2 = self._storage.load(oid2, '')
+
+ # Shut it all down, and try loading from the persistent cache file
+ # without a server present.
self._storage.close()
self.shutdownServer()
- self._storage = self.openClientStorage('test', 1000, wait=0)
- self._storage.load(oid1, '')
- self._storage.load(oid2, '')
+ self._storage = self.openClientStorage('test', cache_size=900,
+ wait=False)
+ # oid2 should still be in cache.
+ self.assertEqual(expected2, self._storage.load(oid2, ''))
+ # But oid1 should have been purged, so that trying to load it will
+ # try to fetch it from the (non-existent) ZEO server.
+ self.assertRaises(ClientDisconnected, self._storage.load, oid1, '')
self._storage.close()
def checkReconnection(self):
More information about the Zodb-checkins
mailing list