[Zope-Checkins] CVS: ZODB3/ZODB/tests - testRecover.py:1.2.4.1 testFileStorage.py:1.19.8.6
Jeremy Hylton
jeremy@zope.com
Fri, 23 May 2003 12:32:40 -0400
Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv3450/ZODB/tests
Modified Files:
Tag: ZODB3-3_1-branch
testFileStorage.py
Added Files:
Tag: ZODB3-3_1-branch
testRecover.py
Log Message:
Fix some serious bugs in fsrecover.
When a corrupted record is found, it guesses a location for the next
good transaction header. If the guessed location happened to have a
'c' character at just the right spot, it would think it was at the end
of the file.
Fix in off-by-one bug in scan() that lead to failure.
Do more sanity checks for invalid transaction headers following a
scan.
Use restore() instead of store() to copy data. This change should
maximize the chance that the recovered storage is identical except for
the damaged records.
Add tests from the trunk and remove test in testFileStorage.
=== Added File ZODB3/ZODB/tests/testRecover.py ===
##############################################################################
#
# Copyright (c) 2003 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""Tests of the file storage recovery script."""
import base64
import os
import random
import sys
import tempfile
import unittest
import StringIO
import ZODB
from ZODB.FileStorage import FileStorage
from ZODB.PersistentMapping import PersistentMapping
from ZODB.fsrecover import recover
from ZODB.tests.StorageTestBase import removefs
from ZODB.fsdump import Dumper
class RecoverTest(unittest.TestCase):
level = 2
path = None
def setUp(self):
self.path = tempfile.mktemp(suffix=".fs")
self.storage = FileStorage(self.path)
self.populate()
self.dest = tempfile.mktemp(suffix=".fs")
self.recovered = None
def tearDown(self):
self.storage.close()
if self.recovered is not None:
self.recovered.close()
removefs(self.path)
removefs(self.dest)
def populate(self):
db = ZODB.DB(self.storage)
cn = db.open()
rt = cn.root()
# create a whole bunch of objects,
# looks like a Data.fs > 1MB
for i in range(50):
d = rt[i] = PersistentMapping()
get_transaction().commit()
for j in range(50):
d[j] = "a" * j
get_transaction().commit()
def damage(self, num, size):
self.storage.close()
# Drop size null bytes into num random spots.
for i in range(num):
offset = random.randint(0, self.storage._pos - size)
f = open(self.path, "a+b")
f.seek(offset)
f.write("\0" * size)
f.close()
ITERATIONS = 5
def recover(self, source, dest):
orig = sys.stdout
try:
sys.stdout = StringIO.StringIO()
try:
recover(self.path, self.dest,
verbose=0, partial=1, force=0, pack=1)
except SystemExit:
raise RuntimeError, "recover tried to exit"
finally:
sys.stdout = orig
def testOneBlock(self):
for i in range(self.ITERATIONS):
self.damage(1, 1024)
self.recover(self.path, self.dest)
self.recovered = FileStorage(self.dest)
self.recovered.close()
os.remove(self.path)
os.rename(self.dest, self.path)
def testFourBlocks(self):
for i in range(self.ITERATIONS):
self.damage(4, 512)
self.recover(self.path, self.dest)
self.recovered = FileStorage(self.dest)
self.recovered.close()
os.remove(self.path)
os.rename(self.dest, self.path)
def testBigBlock(self):
for i in range(self.ITERATIONS):
self.damage(1, 32 * 1024)
self.recover(self.path, self.dest)
self.recovered = FileStorage(self.dest)
self.recovered.close()
os.remove(self.path)
os.rename(self.dest, self.path)
def testBadTransaction(self):
# Find transaction headers and blast them.
L = self.storage.undoLog()
r = L[3]
tid = base64.decodestring(r["id"] + "\n")
pos1 = self.storage._txn_find(tid, False)
r = L[8]
tid = base64.decodestring(r["id"] + "\n")
pos2 = self.storage._txn_find(tid, False)
self.storage.close()
# Overwrite the entire header.
f = open(self.path, "a+b")
f.seek(pos1 - 50)
f.write("\0" * 100)
f.close()
self.recover(self.path, self.dest)
self.recovered = FileStorage(self.dest)
self.recovered.close()
os.remove(self.path)
os.rename(self.dest, self.path)
# Overwrite part of the header.
f = open(self.path, "a+b")
f.seek(pos2 + 10)
f.write("\0" * 100)
f.close()
self.recover(self.path, self.dest)
self.recovered = FileStorage(self.dest)
self.recovered.close()
def test_suite():
return unittest.makeSuite(RecoverTest)
=== ZODB3/ZODB/tests/testFileStorage.py 1.19.8.5 => 1.19.8.6 ===
--- ZODB3/ZODB/tests/testFileStorage.py:1.19.8.5 Mon Mar 17 14:39:15 2003
+++ ZODB3/ZODB/tests/testFileStorage.py Fri May 23 12:32:39 2003
@@ -175,25 +175,6 @@
self.failUnless(self._storage._records_before_save > 20)
- def checkfsrecover(self):
- # an absolutely minimal test of fsrecover
- # Verify that calling recover on a small, correct storage
- # produces a duplicate of the original.
- for i in range(5):
- oid = self._storage.new_oid()
- revid = None
- for j in range(5):
- revid = self._dostore(oid, revid=revid)
-
- temp = sys.stdout
- sys.stdout = StringIO.StringIO()
- try:
- recover(["", "FileStorageTests.fs", "fsrecover.fs"])
- finally:
- sys.stdout = temp
- self.assert_(filecmp.cmp("FileStorageTests.fs", "fsrecover.fs"))
- StorageTestBase.removefs("fsrecover.fs")
-
class FileStorageRecoveryTest(
StorageTestBase.StorageTestBase,
IteratorStorage.IteratorDeepCompare,