updated udev rules to match those found in 45drives-tools, added write option to thermal benchmark scripts

Author: markdhooper

thermal_scripts/tbench

@@ -15,6 +15,7 @@ def wizard(params,server_info):
     params["max_duration"] = get_test_duration()
     params["polling_interval"], tmap_result = get_tmap_interval()
     params["fio_flag"] = get_fio_setting()
+    params["fio_write"] = get_fio_write()
     params["graph_flag"] = get_graph_flag()
     params["graph_settings"] = get_graph_settings(params,server_info,tmap_result) if params["graph_flag"] else {}
     params["rsync_settings"] = get_rsync_params()
@@ -104,6 +105,24 @@ def get_fio_setting():
         flag = False
     return flag
 
+def get_fio_write():
+    selection = ""
+    flag = True
+    while selection not in ["y","Y","n","N"]:
+        selection = input("Would you like to perform WRITES on all storage disks between measurements using fio? (y/n): ")
+        if selection not in ["y","Y","n","N"]:
+            print("Invalid selection. Try again.")
+    if selection in ["y","Y"]:
+        confirm = input("Are you sure? Data can and will be corrupted on your storage disks if you write. (type 'yesiamsure' to confirm): ")
+        if confirm == "yesiamsure":
+            flag = True
+        else:
+            print("yesiamsure not entered. Defaulting to read only.")
+            flag = False
+    if selection in ["n","N"]:
+        flag = False
+    return flag
+
 def get_graph_flag():
     selection = ""
     flag = True
@@ -177,17 +196,15 @@ def run_tplot(params):
     #./tplot -o output/$TEST_NAME.csv -d 120 -i 10 -s 3 -f
     steady_state = 3 + int((60/params["polling_interval"]))
 
-    command = "./tplot -o output/{tn}.csv -d {dur} -i {pi} -s {ss} {fio}".format(
+    command = "./tplot -o output/{tn}.csv -d {dur} -i {pi} -s {ss} {fio} {write}".format(
         tn=params["test_name"],
         dur=params["max_duration"],
         pi=params["polling_interval"],
         ss=steady_state,
-        fio = "-f" if params["fio_flag"] else ""
+        fio = "-f" if params["fio_flag"] else "",
+        write = "-w" if params["fio_flag"] and params["fio_write"] else ""
         )
     return os.system(command)
-    
-
-
 
 
 def run_csv_converter(params):
@@ -243,6 +260,7 @@ def main():
         "max_duration": 3600,
         "polling_interval": 60,
         "fio_flag": True,
+        "write_flag": False,
         "graph_flag": True,
         "graph_settings": {},
         "rsync_settings": {}

thermal_scripts/tplot

@@ -316,7 +316,7 @@ def show_print(win,msg,row=0):
     win.refresh()
     time.sleep(1)
 
-def setup_fio_file(tmap_data):
+def setup_fio_file(tmap_data,write_flag):
     if os.path.isfile(os.path.expanduser("tbench.fio")):
         os.remove(os.path.expanduser("tbench.fio"))
     fio_job_file = open("tbench.fio","w")
@@ -331,6 +331,8 @@ def setup_fio_file(tmap_data):
 
     FIO_PARAMS["global"]["filename"] = disk_string
     FIO_PARAMS["global"]["numjobs"] = str(len(tmap_data["DISKS"]))
+    if write_flag == True:
+        FIO_PARAMS["4k-rand-read"]["rw"] = "randwrite"
 
     for param_group in FIO_PARAMS:
         fio_job_file.write(f"[{param_group}]\n")
@@ -369,7 +371,7 @@ def main(main_screen,args):
     # initialize t_data and get first reading
     t_data = []
     tmap_data = run_tmap(start_time)
-    setup_fio_file(tmap_data)
+    setup_fio_file(tmap_data,args.fio_write)
     t_data.append(tmap_data.copy())
 
 
@@ -431,5 +433,6 @@ if __name__ == "__main__":
     parser.add_option("-o", "--output_file", action="store", type="string",
                       dest="output_file", default="tplot.csv", help="the name of the output file. [default: %default]")
     parser.add_option("-f", "--fio", action="store_true", dest="fio", help="use fio job to stress disks between temperature readings.")
+    parser.add_option("-w", "--write", action="store_true", dest="fio_write", default=False, help="write to all disks using fio.")
     (args, cli_args) = parser.parse_args()
     curses.wrapper(main,args)

udev/68-vdev.rules

@@ -2,6 +2,9 @@
 # /usr/lib/udev/rules.d/68-vdev.rules
 #
 
+# skip these rules if disk was handled by 67-ubm.rules
+ENV{DEVTYPE}=="disk", ENV{DISK_HANDLED_BY_UBM}=="1", GOTO="68-vdev_end"
+
 ENV{DEVTYPE}=="disk", IMPORT{program}="/usr/lib/udev/vdev_id_45drives -d %k -c /etc/vdev_id.conf"
 
 KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
@@ -11,3 +14,4 @@ KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_VDE
 KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
 KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_ALT_PATH}"
 
+LABEL="68-vdev_end"