Commit 1f412c88 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Now I understand why I wanted to delete the contents of cell_list.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@212 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 7ee41db5
...@@ -789,7 +789,8 @@ class Packet(object): ...@@ -789,7 +789,8 @@ class Packet(object):
cell = unpack('!16sH', self._body[index:index+18]) cell = unpack('!16sH', self._body[index:index+18])
index += 18 index += 18
cell_list.append(cell) cell_list.append(cell)
row_list.append((offset, cell_list)) row_list.append((offset, tuple(cell_list)))
del cell_list[:]
except: except:
raise ProtocolError(self, 'invalid answer partition table') raise ProtocolError(self, 'invalid answer partition table')
return ptid, row_list return ptid, row_list
...@@ -809,6 +810,7 @@ class Packet(object): ...@@ -809,6 +810,7 @@ class Packet(object):
index += 18 index += 18
cell_list.append(cell) cell_list.append(cell)
row_list.append((offset, tuple(cell_list))) row_list.append((offset, tuple(cell_list)))
del cell_list[:]
except: except:
raise ProtocolError(self, 'invalid send partition table') raise ProtocolError(self, 'invalid send partition table')
return ptid, row_list return ptid, row_list
......
...@@ -347,7 +347,7 @@ class Replicator(object): ...@@ -347,7 +347,7 @@ class Replicator(object):
conn = self.primary_master_connection conn = self.primary_master_connection
p = Packet() p = Packet()
p.notifyPartitionChanges(conn.getNextId(), p.notifyPartitionChanges(conn.getNextId(),
app.lptid, app.ptid,
[(self.current_partition.getRID(), [(self.current_partition.getRID(),
app.uuid, app.uuid,
UP_TO_DATE_STATE)]) UP_TO_DATE_STATE)])
......
...@@ -185,6 +185,7 @@ class VerificationEventHandler(StorageEventHandler): ...@@ -185,6 +185,7 @@ class VerificationEventHandler(StorageEventHandler):
pt = app.pt pt = app.pt
if app.ptid >= ptid: if app.ptid >= ptid:
# Ignore this packet. # Ignore this packet.
logging.info('ignoring older partition changes')
return return
# First, change the table on memory. # First, change the table on memory.
......
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