Commit 45daad43 authored by Ramon Nou's avatar Ramon Nou
Browse files

Fix compression env test and benchmark cleanup

parent 1397c1ff

perf_tests/perf_data.cpp

+6 −6
Changes for perf_tests/perf_data.cpp: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ int main(int argc, char* argv[]) { 
        write_csv_result("sequential_write", result,

                         result.iterations * file_size);

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // ---- 2. Sequential Read benchmark ----
@@ -529,7 +529,7 @@ int main(int argc, char* argv[]) { 
        write_csv_result("sequential_read", result,

                         result.iterations * file_size);

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // ---- 3. Random Write benchmark ----
@@ -558,7 +558,7 @@ int main(int argc, char* argv[]) { 
        write_csv_result("random_write", result,

                         result.iterations * write_buf.size());

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // ---- 4. Random Read benchmark ----
@@ -588,7 +588,7 @@ int main(int argc, char* argv[]) { 
        write_csv_result("random_read", result,

                         result.iterations * sizeof(char[4096]));

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // ---- 5. Small file write benchmark ----
@@ -611,7 +611,7 @@ int main(int argc, char* argv[]) { 
        );

        std::cout << format_timing(result, "Small file write (" + std::to_string(small_files) + " files)", iterations) << "\n";

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // ---- 6. Small file read benchmark ----
@@ -642,7 +642,7 @@ int main(int argc, char* argv[]) { 
        );

        std::cout << format_timing(result, "Small file read (" + std::to_string(small_files) + " files)", iterations) << "\n";

        

        bench.cleanup();

        if(cleanup) bench.cleanup();

    }

    

    // Cleanup

tests/integration/syscalls/test_config_env.py

+3 −2
Changes for tests/integration/syscalls/test_config_env.py: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ def test_dirents_compression(test_workspace, request, use_compression): 
    Hard to verify compression effect directly without packet capture, but we

    can verify that the daemon logs the flag and that directory listing works.

    """

    common_env = {"GKFS_USE_DIRENTS_COMPRESSION": use_compression}

    daemon_env = {

        "GKFS_USE_DIRENTS_COMPRESSION": use_compression,

        **common_env,

        "GKFS_DAEMON_LOG_LEVEL": "info",

    }
@@ -70,7 +71,7 @@ def test_dirents_compression(test_workspace, request, use_compression): 
            f"Daemon log did not confirm Dirents compression={use_compression} " \

            f"(expected {expected_val})\n{log_content}"



        client_env = {"GKFS_USE_DIRENTS_COMPRESSION": use_compression}

        client_env = common_env.copy()

        client = Client(test_workspace)



        test_dir = test_workspace.mountdir / "dir"