Commit d2dfd817 authored by Aurel's avatar Aurel

finish hot reindexing must be called after final InventoryModule_reindexMovementList


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18294 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9e25fc8f
...@@ -321,7 +321,8 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -321,7 +321,8 @@ class ZCatalog(Folder, Persistent, Implicit):
object_path = self.getPhysicalPath() object_path = self.getPhysicalPath()
# Activities must be removed in the reverse order they were inserted # Activities must be removed in the reverse order they were inserted
# to make sure removing one does not accidntaly trigger the next one. # to make sure removing one does not accidntaly trigger the next one.
method_id_list = ('finishHotReindexing', 'runInventoryMethod', 'playBackRecordedObjectList', method_id_list = ('finishHotReindexing', 'runInventoryMethod',
'playBackRecordedObjectList', 'InventoryModule_reindexMovementList'
'setHotReindexingState') 'setHotReindexingState')
for method_id in method_id_list: for method_id in method_id_list:
portal_activities.flush(object_path, method_id=method_id) portal_activities.flush(object_path, method_id=method_id)
...@@ -530,8 +531,9 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -530,8 +531,9 @@ class ZCatalog(Folder, Persistent, Implicit):
# Once there is nothing to replay, databases are sync'ed, so the new # Once there is nothing to replay, databases are sync'ed, so the new
# catalog can become current. # catalog can become current.
self.activate(passive_commit=1, self.activate(passive_commit=1,
after_method_id=('playBackRecordedObjectList', 'runInventoryMethod'), after_method_id=('playBackRecordedObjectList',
after_tag='runInventoryMethod', 'InventoryModule_reindexMovementList'),
after_tag='InventoryModule_reindexMovementList',
priority=5).finishHotReindexing( priority=5).finishHotReindexing(
source_sql_catalog_id=source_sql_catalog_id, source_sql_catalog_id=source_sql_catalog_id,
destination_sql_catalog_id=destination_sql_catalog_id, destination_sql_catalog_id=destination_sql_catalog_id,
......
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