Commit a4a3691f authored by 's avatar

Added a missed change from the 2.2 branch

parent ce3b938b
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Transaction management """Transaction management
$Id: Transaction.py,v 1.23 2000/06/05 11:04:32 jim Exp $""" $Id: Transaction.py,v 1.24 2000/08/07 20:44:58 brian Exp $"""
__version__='$Revision: 1.23 $'[11:-2] __version__='$Revision: 1.24 $'[11:-2]
import time, sys, struct, POSException import time, sys, struct, POSException
from struct import pack from struct import pack
...@@ -295,16 +295,17 @@ class Transaction: ...@@ -295,16 +295,17 @@ class Transaction:
try: try:
j.tpc_finish(self) # This should never fail j.tpc_finish(self) # This should never fail
except: except:
# Bug if it does, we need to keep track of it and not allow # Bug if it does, we need to keep track of it and
# any more work without at least a restart! # not allow any more work without at least a restart!
global hosed global hosed
hosed=1 hosed=1
LOG('ZODB', PANIC, LOG('ZODB', PANIC,
"A storage error occurred in the last phase of a " "A storage error occurred in the last phase of a "
"two-phase commit. This shouldn\'t happen. " "two-phase commit. This shouldn\'t happen. "
"The application may be in a hosed state, so " "The application may be in a hosed state, so "
"we will not allow transactions to commit from " "transactions will not be allowed to commit "
"here on", error=sys.exc_info()) "until the site/storage is reset by a restart. ",
error=sys.exc_info())
if t is None: if t is None:
t,v,tb=sys.exc_info() t,v,tb=sys.exc_info()
......
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