benchmark-runner 1.0.896__py3-none-any.whl → 1.0.909__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py +1 -1
- benchmark_runner/common/ocp_resources/create_lso.py +13 -2
- benchmark_runner/common/ocp_resources/create_ocp_resource.py +5 -1
- benchmark_runner/common/ocp_resources/lso/template/01_delete_disks_template.sh +12 -0
- benchmark_runner/common/template_operations/templates/hammerdb/internal_data/hammerdb_vm_template.yaml +5 -1
- benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mariadb_template.yaml +1 -1
- benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mssql_template.yaml +1 -1
- benchmark_runner/common/template_operations/templates/hammerdb/internal_data/postgres_template.yaml +1 -1
- benchmark_runner/main/environment_variables.py +3 -1
- benchmark_runner/workloads/workloads_operations.py +2 -2
- {benchmark_runner-1.0.896.dist-info → benchmark_runner-1.0.909.dist-info}/METADATA +2 -1
- {benchmark_runner-1.0.896.dist-info → benchmark_runner-1.0.909.dist-info}/RECORD +15 -14
- {benchmark_runner-1.0.896.dist-info → benchmark_runner-1.0.909.dist-info}/WHEEL +0 -0
- {benchmark_runner-1.0.896.dist-info → benchmark_runner-1.0.909.dist-info}/licenses/LICENSE +0 -0
- {benchmark_runner-1.0.896.dist-info → benchmark_runner-1.0.909.dist-info}/top_level.txt +0 -0
|
@@ -462,7 +462,7 @@ class BenchmarkOperatorWorkloadsOperations:
|
|
|
462
462
|
:return:
|
|
463
463
|
"""
|
|
464
464
|
workload_name = self._workload.split('_')
|
|
465
|
-
if workload_name[0] in self._workloads_odf_pvc:
|
|
465
|
+
if workload_name[0] in self._workloads_odf_pvc and '_lso' not in self._workload:
|
|
466
466
|
if not self._oc.is_odf_installed():
|
|
467
467
|
raise ODFNotInstalled(workload=self._workload)
|
|
468
468
|
|
|
@@ -10,11 +10,14 @@ class CreateLSO(CreateOCPResourceOperations):
|
|
|
10
10
|
"""
|
|
11
11
|
This class is created Local Storage operator
|
|
12
12
|
"""
|
|
13
|
-
def __init__(self, oc: OC, path: str, resource_list: list):
|
|
13
|
+
def __init__(self, oc: OC, path: str, resource_list: list, lso_node: str, lso_disk_id: str, ceph_version: str):
|
|
14
14
|
super().__init__(oc)
|
|
15
15
|
self.__oc = oc
|
|
16
16
|
self.__path = path
|
|
17
17
|
self.__resource_list = resource_list
|
|
18
|
+
self.__lso_node = lso_node
|
|
19
|
+
self.__lso_disk_id = lso_disk_id
|
|
20
|
+
self.__ceph_version = ceph_version
|
|
18
21
|
|
|
19
22
|
@logger_time_stamp
|
|
20
23
|
def create_lso(self, upgrade_version: str):
|
|
@@ -29,7 +32,15 @@ class CreateLSO(CreateOCPResourceOperations):
|
|
|
29
32
|
else:
|
|
30
33
|
for resource in self.__resource_list:
|
|
31
34
|
logger.info(f'run {resource}')
|
|
32
|
-
|
|
35
|
+
if resource.endswith('.sh'):
|
|
36
|
+
if '01_delete_disks.sh' == resource and self.__lso_disk_id:
|
|
37
|
+
disk = f'/dev/disk/by-id/{self.__lso_disk_id}'
|
|
38
|
+
delete_node_disk = f""" podman run --authfile /var/lib/kubelet/config.json --rm --privileged --device "$(readlink -e '{disk}')" --entrypoint ceph-bluestore-tool quay.io/ceph/ceph:v{self.__ceph_version} zap-device --dev "$(readlink -e '{disk}')" --yes-i-really-really-mean-it """
|
|
39
|
+
logger.info(f'{self.__lso_node}: {delete_node_disk}')
|
|
40
|
+
self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/{resource} "{self.__lso_node}" "{delete_node_disk}"')
|
|
41
|
+
else:
|
|
42
|
+
logger.info(f'run {resource}')
|
|
43
|
+
self.__oc.create_async(yaml=os.path.join(self.__path, resource))
|
|
33
44
|
|
|
34
45
|
# verify once after create all resource files
|
|
35
46
|
self.wait_for_ocp_resource_create(operator='lso',
|
|
@@ -24,6 +24,10 @@ class CreateOCPResource:
|
|
|
24
24
|
self.__oc.populate_additional_template_variables(self.__environment_variables_dict)
|
|
25
25
|
self.__worker_disk_prefix = self.__environment_variables_dict.get('worker_disk_prefix', '')
|
|
26
26
|
self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')
|
|
27
|
+
self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')
|
|
28
|
+
self.__lso_disk_id = self.__environment_variables_dict.get('lso_disk_id', '')
|
|
29
|
+
self.__lso_node = self.__environment_variables_dict.get('lso_node', '')
|
|
30
|
+
self.__ceph_version = self.__environment_variables_dict.get('ceph_version', '')
|
|
27
31
|
if self.__worker_disk_ids:
|
|
28
32
|
if self.__worker_disk_ids:
|
|
29
33
|
# Solved GitHub Actions issue that env variable detect as string instead of dict/ list -skip for Jenkins
|
|
@@ -80,7 +84,7 @@ class CreateOCPResource:
|
|
|
80
84
|
self.remove_resource_files(path=os.path.join(self.__dir_path, resource))
|
|
81
85
|
resource_files = self.get_sorted_resources(resource=resource)
|
|
82
86
|
if 'lso' == resource:
|
|
83
|
-
create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
|
|
87
|
+
create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, lso_node=self.__lso_node, lso_disk_id=self.__lso_disk_id, ceph_version=self.__ceph_version)
|
|
84
88
|
create_lso.create_lso(upgrade_version)
|
|
85
89
|
elif 'odf' == resource:
|
|
86
90
|
create_odf = CreateODF(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, worker_disk_ids=self.__worker_disk_ids, worker_disk_prefix=self.__worker_disk_prefix)
|
|
@@ -11,7 +11,7 @@ spec:
|
|
|
11
11
|
- key: kubernetes.io/hostname
|
|
12
12
|
operator: In
|
|
13
13
|
values:
|
|
14
|
-
- {{
|
|
14
|
+
- {{ lso_node }}
|
|
15
15
|
storageClassDevices:
|
|
16
16
|
- storageClassName: local-sc
|
|
17
17
|
volumeMode: Block
|
|
@@ -42,7 +42,11 @@ spec:
|
|
|
42
42
|
name: hammerdb
|
|
43
43
|
args:
|
|
44
44
|
pin: {{ pin }} # enable for nodeSelector
|
|
45
|
+
{%- if storage_type == 'lso' %}
|
|
46
|
+
pin_node: "{{ lso_node }}"
|
|
47
|
+
{%- else %}
|
|
45
48
|
pin_node: "{{ pin_node2 }}"
|
|
49
|
+
{%- endif %}
|
|
46
50
|
db_type: "{{ db_type }}"
|
|
47
51
|
timed_test: true
|
|
48
52
|
test_type: "tpc-c"
|
|
@@ -146,9 +146,11 @@ class EnvironmentVariables:
|
|
|
146
146
|
else:
|
|
147
147
|
self._environment_variables_dict['storage_type'] = 'ephemeral'
|
|
148
148
|
|
|
149
|
-
# LSO Disk id - auto-detect when located on worker-2
|
|
149
|
+
# LSO Disk id - auto-detect when located on worker-2, put only the id not full ( i.e. /dev/disk/by-id/{{ lso_disk_id }} )
|
|
150
150
|
self._environment_variables_dict['lso_disk_id'] = EnvironmentVariables.get_env('LSO_DISK_ID', '')
|
|
151
151
|
self._environment_variables_dict['lso_node'] = EnvironmentVariables.get_env('LSO_NODE', '')
|
|
152
|
+
# Ceph version required for disk cleanup, using default 19
|
|
153
|
+
self._environment_variables_dict['ceph_version'] = EnvironmentVariables.get_env('CEPH_VERSION', '19')
|
|
152
154
|
# Workloads that required ODF
|
|
153
155
|
self._environment_variables_dict['workloads_odf_pvc'] = ['vdbench', 'hammerdb']
|
|
154
156
|
# This parameter get from Test_CI.yml file
|
|
@@ -184,11 +184,11 @@ class WorkloadsOperations:
|
|
|
184
184
|
@logger_time_stamp
|
|
185
185
|
def odf_workload_verification(self):
|
|
186
186
|
"""
|
|
187
|
-
This method verifies whether the ODF operator is installed for ODF workloads and raises an error if it is missing
|
|
187
|
+
This method verifies whether the ODF operator is installed for ODF workloads and raises an error if it is missing, skip for LSO workload
|
|
188
188
|
:return:
|
|
189
189
|
"""
|
|
190
190
|
workload_name = self._workload.split('_')
|
|
191
|
-
if workload_name[0] in self._workloads_odf_pvc:
|
|
191
|
+
if workload_name[0] in self._workloads_odf_pvc and '_lso' not in self._workload:
|
|
192
192
|
if not self._oc.is_odf_installed():
|
|
193
193
|
raise ODFNotInstalled(workload=self._workload)
|
|
194
194
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: benchmark-runner
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.909
|
|
4
4
|
Summary: Benchmark Runner Tool
|
|
5
5
|
Home-page: https://github.com/redhat-performance/benchmark-runner
|
|
6
6
|
Author: Red Hat
|
|
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
|
|
|
13
13
|
Classifier: Programming Language :: Python :: 3.10
|
|
14
14
|
Classifier: Programming Language :: Python :: 3.11
|
|
15
15
|
Classifier: Programming Language :: Python :: 3.12
|
|
16
|
+
Classifier: Programming Language :: Python :: 3.13
|
|
16
17
|
Description-Content-Type: text/markdown
|
|
17
18
|
License-File: LICENSE
|
|
18
19
|
Requires-Dist: attrs==21.4.0
|
|
@@ -2,7 +2,7 @@ benchmark_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
|
|
|
2
2
|
benchmark_runner/benchmark_operator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
3
3
|
benchmark_runner/benchmark_operator/benchmark_operator_exceptions.py,sha256=5BCKcvLBMLFW4-XgZ7uXrja7uOE0UaplxAsdkKTpmek,1668
|
|
4
4
|
benchmark_runner/benchmark_operator/benchmark_operator_workloads.py,sha256=dL09ni6x4yaNFHs5djEebe4KE7M4n_rupWH7ngHpJwc,1425
|
|
5
|
-
benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py,sha256=
|
|
5
|
+
benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py,sha256=Gw_pyjfom_Ry2WRvT2KzF0GhqeDD5O99WEDmN2t1mig,25095
|
|
6
6
|
benchmark_runner/benchmark_operator/hammerdb_pod.py,sha256=3wrjXW0XZwhWKamk_Yw82ibo5RmTUva4rpmcVogXqF8,8257
|
|
7
7
|
benchmark_runner/benchmark_operator/hammerdb_vm.py,sha256=0FhgEvfgbKwUyLEK3be9LYoishOkM4VZqhcTp6zIUr8,5915
|
|
8
8
|
benchmark_runner/benchmark_operator/stressng_pod.py,sha256=4K8PGSv-OCfyBMelJjscVtsCtuvhEx1AuO0biewGF5Q,5398
|
|
@@ -54,9 +54,9 @@ benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
|
|
|
54
54
|
benchmark_runner/common/ocp_resources/create_cnv.py,sha256=uT7sOG-LV3pU1Rt8jbQ9GcwJQhxOu5FVixvDg-Vpm8U,3779
|
|
55
55
|
benchmark_runner/common/ocp_resources/create_custom.py,sha256=rthm96yDzI-Hke54hLWTs0O3gDtpQPR6n184ehaEevo,1029
|
|
56
56
|
benchmark_runner/common/ocp_resources/create_kata.py,sha256=IhfnDHj0lLUVENA-Nh9BucSAt0BqL8mtqT6QloMzIDg,3721
|
|
57
|
-
benchmark_runner/common/ocp_resources/create_lso.py,sha256=
|
|
57
|
+
benchmark_runner/common/ocp_resources/create_lso.py,sha256=7DgcN1E2igfgdUqucMqACbP26jMTnfKhU8_aIAdgl3o,2619
|
|
58
58
|
benchmark_runner/common/ocp_resources/create_nhc_far.py,sha256=WGNDMLZfODy6FImmkgQjxg3Z4Gsnpxwa5lJCOShmxe8,2541
|
|
59
|
-
benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=
|
|
59
|
+
benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=SMyC0dASsN9Xhi3nrRpORWsvWYwKockAFzA5Iz1-T1Y,5918
|
|
60
60
|
benchmark_runner/common/ocp_resources/create_ocp_resource_exceptions.py,sha256=hthowyHAeg66IZHYPe1FWU3dnhwXcQtPBrOQSO1RZMU,941
|
|
61
61
|
benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py,sha256=47SyVjtv5e9vKuRQFlC-VfGKXBLEl46rut4XVeZRsMo,6834
|
|
62
62
|
benchmark_runner/common/ocp_resources/create_odf.py,sha256=Frtx4EOYILHROeSzX3sO9b28zzDUt4waN92RwSPzr4c,4421
|
|
@@ -69,6 +69,7 @@ benchmark_runner/common/ocp_resources/infra/template/01_cluster-monitoring-confi
|
|
|
69
69
|
benchmark_runner/common/ocp_resources/kata/template/01_operator_template.yaml,sha256=WS1IF84S9pmH_-bA1iyT0Jsn548FODyRa-k9umYYgSg,636
|
|
70
70
|
benchmark_runner/common/ocp_resources/kata/template/02_config_template.yaml,sha256=68Lwu2ltu4MFDFzJ5rEs2ovArAqnC-1PO20DFx8KPNw,179
|
|
71
71
|
benchmark_runner/common/ocp_resources/kata/template/03_ocp48_patch_template.sh,sha256=VUCBd8_NHveaSyZhdtVzLfGQJptMQEOSsHRx67GLxYY,1406
|
|
72
|
+
benchmark_runner/common/ocp_resources/lso/template/01_delete_disks_template.sh,sha256=eXX9RqwrbRsuhZf6x3j9QaZq207hU-qvz3xMp5-G3Tg,220
|
|
72
73
|
benchmark_runner/common/ocp_resources/lso/template/01_namespace_template.yaml,sha256=Bd8DNCr_DXVDPmA5guDB-bgyYG8ddMuZJBToX2f8RU4,82
|
|
73
74
|
benchmark_runner/common/ocp_resources/lso/template/02_operator_group_template.yaml,sha256=XjTjbvhAdtQLaLsHOdUcvlt3u7Yz-ufno6KvvLYxtiI,186
|
|
74
75
|
benchmark_runner/common/ocp_resources/lso/template/03_catalogsource_template.yaml,sha256=P4OYMsdT1yo1gHXriJc0Pp9P0L3V3bMtQ2Yr7qK_2hM,420
|
|
@@ -109,10 +110,10 @@ benchmark_runner/common/template_operations/templates/bootstorm/bootstorm_data_t
|
|
|
109
110
|
benchmark_runner/common/template_operations/templates/bootstorm/internal_data/bootstorm_vm_template.yaml,sha256=NqJwyyJngOGiYQONk8gyigjoUvJexae2g7lc5sU1AR8,1498
|
|
110
111
|
benchmark_runner/common/template_operations/templates/hammerdb/hammerdb_data_template.yaml,sha256=DGwes_qSSCkM8R1nAQa1Robx_Mt7_qBbL-g3stZ-ZxM,1905
|
|
111
112
|
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/hammerdb_pod_template.yaml,sha256=jR120-MnuXBQqm7gHf7-VeaYuwy27mHMpteeifYIYs8,2517
|
|
112
|
-
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/hammerdb_vm_template.yaml,sha256=
|
|
113
|
-
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mariadb_template.yaml,sha256=
|
|
114
|
-
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mssql_template.yaml,sha256=
|
|
115
|
-
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/postgres_template.yaml,sha256=
|
|
113
|
+
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/hammerdb_vm_template.yaml,sha256=2pXlPanrOfB2IYCfP28ET_UaY0x9XVxWBm98DJp1OD8,4315
|
|
114
|
+
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mariadb_template.yaml,sha256=1hf7vXLcjgzv6yf76E-kzYl5HxvfRyN3d1DmA9JtW_A,4454
|
|
115
|
+
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mssql_template.yaml,sha256=EyFIu4KQBGlxGlarBbk46hiYQM1xXU2LdeIvAfE70V0,3637
|
|
116
|
+
benchmark_runner/common/template_operations/templates/hammerdb/internal_data/postgres_template.yaml,sha256=64x_E-LpqXjOO7xB6QWpbr-rBVzT95BKd7cyXZq3HsE,4807
|
|
116
117
|
benchmark_runner/common/template_operations/templates/scale/redis_template.yaml,sha256=R6NSypqAgBpXgcz2mSmBbnJFWSSGli5aK-M5pGJE3Rk,873
|
|
117
118
|
benchmark_runner/common/template_operations/templates/scale/state_signals_exporter_pod_template.yaml,sha256=lkmtghwYhSzJxg8Wv9EojKDvtJBbxd1qAE71QicP9dw,987
|
|
118
119
|
benchmark_runner/common/template_operations/templates/stressng/stressng_data_template.yaml,sha256=T5eiOQ4aPiRTzWaNIP0vbGR8POjGxP0XtPAaLCCBiTM,773
|
|
@@ -162,7 +163,7 @@ benchmark_runner/krkn_hub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
|
|
|
162
163
|
benchmark_runner/krkn_hub/krknhub_exceptions.py,sha256=Hk7Co6zZ0u2RSmBmS4ZAi21ffZaQ2ITTfl6tGLtiAdY,180
|
|
163
164
|
benchmark_runner/krkn_hub/krknhub_workloads.py,sha256=o5DO_ObIuRf1MKfN1DuRtRfsxho_BdtZHUNPvbWqguY,3883
|
|
164
165
|
benchmark_runner/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
165
|
-
benchmark_runner/main/environment_variables.py,sha256=
|
|
166
|
+
benchmark_runner/main/environment_variables.py,sha256=3IKYIJyA3pMQWSj8TpX4mlwSpDsKh1QXltfMjylEsxc,30637
|
|
166
167
|
benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
|
|
167
168
|
benchmark_runner/main/main.py,sha256=A744O550wQh37hhk10H0HlT28LZ_2EOaRlJyWG6Pras,14083
|
|
168
169
|
benchmark_runner/main/temporary_environment_variables.py,sha256=ODSHkfhgvdr_b2e3XyvykW21MVjSdyqimREyMc2klRE,957
|
|
@@ -173,9 +174,9 @@ benchmark_runner/workloads/vdbench_vm.py,sha256=4rRbE-jAbmNrhP-k8F_OREkJ59VfQ7wL
|
|
|
173
174
|
benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qtaEEZx4T-ex4,2415
|
|
174
175
|
benchmark_runner/workloads/workloads.py,sha256=F9fnk4h715tq7ANSCbDH0jktB8fpr_u3YG61Kdi5_os,1422
|
|
175
176
|
benchmark_runner/workloads/workloads_exceptions.py,sha256=u7VII95iPRF_YhfpGH1U1RmgiIYESMOtbSF1dz7_ToE,1858
|
|
176
|
-
benchmark_runner/workloads/workloads_operations.py,sha256=
|
|
177
|
-
benchmark_runner-1.0.
|
|
178
|
-
benchmark_runner-1.0.
|
|
179
|
-
benchmark_runner-1.0.
|
|
180
|
-
benchmark_runner-1.0.
|
|
181
|
-
benchmark_runner-1.0.
|
|
177
|
+
benchmark_runner/workloads/workloads_operations.py,sha256=f_Gn4Ynk9aVZsW8dVLW4jFnC676FEc2VvLxGuf9GM4s,27433
|
|
178
|
+
benchmark_runner-1.0.909.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
179
|
+
benchmark_runner-1.0.909.dist-info/METADATA,sha256=DqpuKIAoOTqNbGuxtkp3-4Tw0T0I2xQek0wf2CnfE90,11633
|
|
180
|
+
benchmark_runner-1.0.909.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
181
|
+
benchmark_runner-1.0.909.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
|
|
182
|
+
benchmark_runner-1.0.909.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|