Fix kill behaviour preventing .prof output

input-output-hk · May 13, 2021 · 93308e7 · 93308e7
1 parent 74d4184
commit 93308e7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/nix/nixos/tests/mem-usage.nix b/nix/nixos/tests/mem-usage.nix
@@ -99,7 +99,8 @@ in
       };
       systemd.services.metadata-server.serviceConfig.WorkingDirectory = metadataWorkingDir;
       systemd.services.metadata-server.serviceConfig.RuntimeDirectoryPreserve = true;
-      systemd.services.metadata-server.serviceConfig.ExecStop = "${pkgs.coreutils}/bin/kill -s SIGINT $MAINPID";
+      systemd.services.metadata-server.serviceConfig.KillSignal = "SIGINT";
+      systemd.services.metadata-server.serviceConfig.TimeoutStopSec = "10";
 
       systemd.tmpfiles.rules = [
         "L /root/vegeta.atk - - - - ${vegetaCommands}"
@@ -124,6 +125,7 @@ in
     server.succeed("cd ${metadataWorkingDir} && hp2pretty metadata-server.hp")
     server.succeed("cd ${metadataWorkingDir} && profiteur metadata-server.prof")
     server.copy_from_vm("${metadataWorkingDir}/metadata-server.svg")
+    server.copy_from_vm("${metadataWorkingDir}/metadata-server.prof")
     server.copy_from_vm("${metadataWorkingDir}/metadata-server.prof.html")
 
     def write_hydra_build_products(data):
@@ -135,5 +137,6 @@ in
 
     write_hydra_build_products("file svg {}/metadata-server.svg")
     write_hydra_build_products("file html {}/metadata-server.prof.html")
+    write_hydra_build_products("file text {}/metadata-server.prof")
     '';
 }