diff --git a/test/testing_scripts/check_data_consistency.py b/test/testing_scripts/check_data_consistency.py index 17d81b0e0968ea7f7e663f0efdc88e9cf6973be6..2c805c990670fc700187943b6c59b013b78573a6 100644 --- a/test/testing_scripts/check_data_consistency.py +++ b/test/testing_scripts/check_data_consistency.py @@ -7,8 +7,8 @@ from pathlib import Path from compute_md5 import compute_md5 home_path = "/home/dcristof/" -data_path = "scdaq/test/data/run000000/in_progress/" -#data_path = "scdaq/test/data/run000000/" +#data_path = "scdaq/test/data/run000000/in_progress/" +data_path = "scdaq/test/data/run000000/" byte_skip = 400 BUF_SIZE = 65536 # lets read stuff in 64kb chunks! @@ -71,9 +71,18 @@ def write_copy_and_check(file, copied_file=None, verbose=False, skip=0, dev="dax path = os.path.join(home_path, data_path) print(path) print(file) - file = path + file - copied_file = path + "/copied_" + file - + f = path + file + copied_file = path + "copied_" + file + print(f) + + if not os.path.exists(f): + f = home_path + data_path + "in_progress/" + file + copied_file = home_path + data_path + "in_progress/copied_" + file + print(f) + + file = f + + print(file) #print(file) write_file_to_dax(file, dev, skip=skip) copy_file_from_dax(file, copied_file, dev, skip=skip) @@ -92,15 +101,16 @@ def write_copy_and_check(file, copied_file=None, verbose=False, skip=0, dev="dax copiedFile_md5 = compute_md5(copied_file) if file_md5 == copiedFile_md5: - print(f"{file}: Success! Files are identical.") + #print(f"{file}: Success! Files are identical.") + print("Success! Files are identical.") else: print(f"{file}: Error! Files differ.") - os.remove(copied_file) - if verbose: - print(f"{file} MD5 hash: {file_md5}") - print(f"Copied {file} MD5 hash: {copiedFile_md5}") + print(f"MD5 hash: {file_md5}") + print(f"Copied MD5 hash: {copiedFile_md5}") + + os.remove(copied_file) def main(): parser = argparse.ArgumentParser(description='Writes a file(s) into the dax device, copies them back, and checks if they are consistent using MD5 hashing.') @@ -114,14 +124,11 @@ def main(): args = parser.parse_args() if args.file is None: for root, dirs, files in os.walk(args.path): - for root, dirs, files in os.walk(args.path): + #for root, dirs, files in os.walk(args.path): for file in files: file_path = os.path.join(root, file) - #print(root) - copied_file_path= root + "/copied_" + file - #file_path = root - #print(file_path) - #if os.path.isfile(file_path): + copied_file_path = os.path.join(root, "copied_") + copied_file_path = copied_file_path + file write_copy_and_check(file_path, copied_file_path, verbose=args.verbose, skip=args.skip, dev=args.device) diff --git a/test/testing_scripts/famfs_write.sh b/test/testing_scripts/famfs_write.sh old mode 100644 new mode 100755 index 8953ff50ba39cde4fa81702bd309c30124c11ac8..3c87c361b3a5d54f6826e58ba0b839d665e6da53 --- a/test/testing_scripts/famfs_write.sh +++ b/test/testing_scripts/famfs_write.sh @@ -8,19 +8,19 @@ sudo rm /mnt/famfs/cat* sudo g++ creat_test.cpp -o test -alloc_size=1024 -file_size=400 +alloc_size=1073741824 +file_size=1073741824 echo "Allocating..." -sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_write} -sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_fwrite} -sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_mmap} +#sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_write} +#sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_fwrite} +#sudo ../../../famfs/debug/famfs creat -s ${alloc_size} ${fname_mmap} echo "Writing..." sudo ./test /mnt/famfs/ catty ${file_size} echo "Reporting diffs to baseline..." comp_bytes=${file_size} -sudo diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_fwrite}) -sudo diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_write}) -sudo diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_mmap}) \ No newline at end of file +diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_fwrite}) +diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_write}) +diff -s <(cut -c1-${comp_bytes} ${fname_baseline}) <(cut -c1-${comp_bytes} ${fname_mmap})