Skip to content

Commit 235b4aa

Browse files
authored
fix odf delete disk (#706)
1 parent 5561930 commit 235b4aa

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

benchmark_runner/common/oc/oc.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@ def get_free_disk_id(self):
100100
else:
101101
raise Exception('Missing free disk id')
102102

103+
@typechecked
104+
def run_debug_node(self, node: str, cmd: str):
105+
"""
106+
This method runs command in debug node
107+
:param: node
108+
:param: cmd
109+
:return:
110+
"""
111+
self.run(f"{self.__cli} debug node/{node} --no-tty=true -- chroot /host sh -c '{cmd}'")
112+
103113
def get_kata_operator_version(self):
104114
"""
105115
This method returns kata operator version

benchmark_runner/common/ocp_resources/create_odf.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def create_odf(self):
3535
for disk_id in disk_ids:
3636
disk = f'/dev/disk/by-id/{self.__worker_disk_prefix}{disk_id}'
3737
delete_node_disk += f"sgdisk --zap-all {disk}; wipefs -a {disk}; dd if=/dev/zero of='{disk}' bs=1M count=100 oflag=direct,dsync; blkdiscard {disk}; partprobe {disk};"
38-
self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/./{resource} "{node}" "{delete_node_disk}"')
38+
self.__oc.run_debug_node(node=node, cmd=delete_node_disk)
3939
delete_node_disk = ''
4040
else:
4141
self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/./{resource}')
@@ -72,7 +72,4 @@ def create_odf(self):
7272
self.wait_for_ocp_resource_create(resource='odf',
7373
verify_cmd='oc get pod -n openshift-storage | grep osd | grep -v prepare | wc -l',
7474
count_openshift_storage=True, verify_installation=True)
75-
# @todo - remove if not solve ODF installation failure
76-
logger.info(f"sleep {self._environment_variables_dict.get('bulk_sleep_time', '')} seconds")
77-
time.sleep(int(self._environment_variables_dict.get('bulk_sleep_time', '')))
7875
return True

0 commit comments

Comments
 (0)