Commit 6439da54 authored by Jim Fulton's avatar Jim Fulton

Changed _finish to bail if tpc_vote wasn't called or didn't do anything.

parent 56e2f9d8
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
# may have a back pointer to a version record or to a non-version # may have a back pointer to a version record or to a non-version
# record. # record.
# #
__version__='$Revision: 1.45 $'[11:-2] __version__='$Revision: 1.46 $'[11:-2]
import struct, time, os, bpthread, string, base64, sys import struct, time, os, bpthread, string, base64, sys
from struct import pack, unpack from struct import pack, unpack
...@@ -762,21 +762,23 @@ class FileStorage(BaseStorage.BaseStorage): ...@@ -762,21 +762,23 @@ class FileStorage(BaseStorage.BaseStorage):
finally: self._lock_release() finally: self._lock_release()
def _finish(self, tid, u, d, e): def _finish(self, tid, u, d, e):
file=self._file nextpos=self._nextpos
if nextpos:
file=self._file
# Clear the checkpoint flag # Clear the checkpoint flag
file.seek(self._pos+16) file.seek(self._pos+16)
file.write(self._tstatus) file.write(self._tstatus)
file.flush() file.flush()
if fsync is not None: fsync(file.fileno()) if fsync is not None: fsync(file.fileno())
self._pos=self._nextpos self._pos=nextpos
index=self._index index=self._index
for oid, pos in self._tindex: index[oid]=pos for oid, pos in self._tindex: index[oid]=pos
self._vindex.update(self._tvindex) self._vindex.update(self._tvindex)
def _abort(self): def _abort(self):
if self._nextpos: self._file.truncate(self._nextpos) if self._nextpos: self._file.truncate(self._nextpos)
......
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