Skip to content

weko#57254 fix delete index issue #1807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wei-kuochen wants to merge 1 commit into
base: develop_v2.0.0
Choose a base branch
from
Open

weko#57254 fix delete index issue #1807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions modules/weko-index-tree/weko_index_tree/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,18 +959,14 @@ def __get_redis_store():
return redis_connection.connection(db=current_app.config['CACHE_REDIS_DB'], kv = True)


def lock_all_child_index(index_id: str, value: str):
def lock_all_child_index(index_id: str, value: str, locked_key: list):
"""Lock index.

Args:
index_id (str): index identifier.
value (str): Lock value.

Returns:
bool: True if the index is locked.

locked_key (list): locked key list.
"""
locked_key = []
try:
from .api import Indexes
redis_store = __get_redis_store()
Expand All @@ -982,8 +978,6 @@ def lock_all_child_index(index_id: str, value: str):
locked_key.append(key_prefix + str(c_index.cid))
except Exception as e:
current_app.logger.error('Could not lock index:', e)
return False, locked_key
return True, locked_key


def unlock_index(index_key):
Expand All @@ -1003,25 +997,23 @@ def unlock_index(index_key):
current_app.logger.error('Could not unlock index:', e)


def validate_before_delete_index(index_id):
def validate_before_delete_index(index_id, locked_key, errors):
"""Validate index data before deleting the index.

Args:
index_id (str|int): Index identifier.
locked_key (list): Locked key list.
errors (list): Error list.

Returns:
(boolean, list, list): unlock flag and error list and locked keys list

"""
is_unlock = False
locked_key = []
errors = []
if is_index_locked(index_id):
errors.append(
_('Index Delete is in progress on another device.'))
else:
is_unlock, locked_key = lock_all_child_index(index_id,
str(current_user.get_id()))
lock_all_child_index(index_id, str(current_user.get_id()), locked_key)
if check_doi_in_index(index_id):
errors.append(
_('The index cannot be deleted because there is'
Expand All @@ -1033,8 +1025,6 @@ def validate_before_delete_index(index_id):
errors.append(_('The index cannot be deleted becase '
'the index in harvester settings.'))

return is_unlock, errors, locked_key


def is_index_locked(index_id):
"""Check locked index.
Expand Down Expand Up @@ -1071,12 +1061,11 @@ def perform_delete_index(index_id, record_class, action: str):
tuple(str, list): delete message and error list

"""
is_unlock = True
locked_key = []
errors = []
try:
msg = ''
is_unlock, errors, locked_key = validate_before_delete_index(index_id)
validate_before_delete_index(index_id, locked_key, errors)
if len(errors) == 0:
res = record_class.get_self_path(index_id)
if not res:
Expand Down Expand Up @@ -1113,8 +1102,9 @@ def perform_delete_index(index_id, record_class, action: str):
remarks=tb_info[0]
)
msg = 'Failed to delete index.'
errors.append(msg)
finally:
if is_unlock:
if locked_key:
unlock_index(locked_key)
return msg, errors

Expand Down
Loading