Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

EOS-27350: Utils_setup reset and cleanup phases are failing #703

Merged
merged 5 commits into from
Jan 17, 2022
Merged

EOS-27350: Utils_setup reset and cleanup phases are failing #703

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2999399
Utils mini provisioning fix
suryakumar1024 Jan 11, 2022
37a640e
Merge branch 'main' into utils_mp_fix
suryakumar1024 Jan 13, 2022
43328c3
Code optimize and purge changes
suryakumar1024 Jan 16, 2022
50ceeb7
Merge branch 'utils_mp_fix' of https://github.com/suryakumar1024/cort…
suryakumar1024 Jan 16, 2022
1190ba3
Merge branch 'main' into utils_mp_fix
Jan 17, 2022
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
65 changes: 29 additions & 36 deletions py-utils/src/setup/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,31 +246,24 @@ def test(config_path: str, plan: str):
@staticmethod
def reset(config_path: str):
"""Remove/Delete all the data/logs that was created by user/testing."""
import time
from cortx.utils.message_bus.error import MessageBusError
_purge_retry = 20
try:
from cortx.utils.message_bus import MessageBusAdmin
from cortx.utils.message_bus import MessageBusAdmin, MessageBus
from cortx.utils.message_bus import MessageProducer
Conf.load('config', config_path, skip_reload=True)
message_bus_backend = Conf.get('config', \
'cortx>utils>message_bus_backend')
message_server_endpoints = Conf.get('config', \
f'cortx>external>{message_bus_backend}>endpoints')
MessageBus.init(message_server_endpoints)
mb = MessageBusAdmin(admin_id='reset')
message_types_list = mb.list_message_types()
if message_types_list:
for message_type in message_types_list:
producer = MessageProducer(producer_id=message_type, \
message_type=message_type, method='sync')
for retry_count in range(1, (_purge_retry + 2)):
if retry_count > _purge_retry:
Log.error(f"MessageBusError: {errors.ERR_OP_FAILED} " \
f" Unable to delete messages for message type" \
f" {message_type} after {retry_count} retries")
raise MessageBusError(errors.ERR_OP_FAILED,\
"Unable to delete messages for message type" + \
"%s after %d retries", message_type, \
retry_count)
rc = producer.delete()
if rc == 0:
break
time.sleep(2*retry_count)
producer.delete()

except MessageBusError as e:
raise SetupError(e.rc, "Can not reset Message Bus. %s", e)
except Exception as e:
Expand All @@ -290,26 +283,26 @@ def reset(config_path: str):
@staticmethod
def cleanup(pre_factory: bool, config_path: str):
"""Remove/Delete all the data that was created after post install."""
local_path = CortxConf.get_storage_path('local')
utils_conf = os.path.join(local_path, 'utils/conf/utils.conf')

if os.path.exists(utils_conf):
# delete message_types
from cortx.utils.message_bus.error import MessageBusError
try:
from cortx.utils.message_bus import MessageBusAdmin
mb = MessageBusAdmin(admin_id='cleanup')
message_types_list = mb.list_message_types()
if message_types_list:
mb.deregister_message_type(message_types_list)
except MessageBusError as e:
raise SetupError(e.rc, "Can not cleanup Message Bus. %s", e)
except Exception as e:
raise SetupError(errors.ERR_OP_FAILED, "Can not cleanup Message \
Bus. %s", e)

config_files = [utils_conf]
Utils._delete_files(config_files)

# delete message_types
from cortx.utils.message_bus.error import MessageBusError
try:
from cortx.utils.message_bus import MessageBus, MessageBusAdmin
Conf.load('config', config_path, skip_reload=True)
message_bus_backend = Conf.get('config', \
'cortx>utils>message_bus_backend')
message_server_endpoints = Conf.get('config', \
f'cortx>external>{message_bus_backend}>endpoints')
MessageBus.init(message_server_endpoints)
mb = MessageBusAdmin(admin_id='cleanup')
message_types_list = mb.list_message_types()
if message_types_list:
mb.deregister_message_type(message_types_list)
except MessageBusError as e:
raise SetupError(e.rc, "Can not cleanup Message Bus. %s", e)
except Exception as e:
raise SetupError(errors.ERR_OP_FAILED, "Can not cleanup Message \
Bus. %s", e)

if pre_factory:
# deleting all log files as part of pre-factory cleanup
Expand Down