@@ -798,12 +798,12 @@ fn rackscale_memcached_checkout() {
798
798
}
799
799
800
800
println ! (
801
- "CHECKOUT 9a549169d0c6b8a33503a9615f636d5ced8d87d1 {:?}" ,
801
+ "CHECKOUT fe0eb024882481717efd6a3f4600e96c99ca77a2 {:?}" ,
802
802
out_dir
803
803
) ;
804
804
805
805
let res = Command :: new ( "git" )
806
- . args ( & [ "checkout" , "9a549169d0c6b8a33503a9615f636d5ced8d87d1 " ] )
806
+ . args ( & [ "checkout" , "fe0eb024882481717efd6a3f4600e96c99ca77a2 " ] )
807
807
. current_dir ( out_dir_path. as_path ( ) )
808
808
. output ( )
809
809
. expect ( "git checkout failed" ) ;
@@ -988,8 +988,12 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
988
988
continue ;
989
989
}
990
990
991
+ println ! ( "" ) ;
992
+
991
993
config. num_threads = num_threads;
992
994
995
+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
996
+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
993
997
let mut pty = run_benchmark_internal ( & config, timeout_ms) ;
994
998
let mut output = String :: new ( ) ;
995
999
let res =
@@ -1009,10 +1013,13 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
1009
1013
for protocol in & [ "tcp" , "unix" ] {
1010
1014
config. protocol = protocol;
1011
1015
1016
+ println ! ( "" ) ;
1017
+
1012
1018
println ! ( "Memcached Sharded: {num_threads}x{num_nodes} with {protocol}" ) ;
1013
1019
1014
1020
// terminate the memcached instance
1015
1021
let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
1022
+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
1016
1023
1017
1024
let mut memcached_ctrls = Vec :: new ( ) ;
1018
1025
for i in 0 ..num_nodes {
@@ -1073,6 +1080,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
1073
1080
println ! ( "MEMCACHED-OUTPUT: {}" , l) ;
1074
1081
}
1075
1082
}
1083
+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
1076
1084
}
1077
1085
} ;
1078
1086
}
@@ -1314,7 +1322,7 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
1314
1322
fn cmd_fn ( num_cores : usize , arg : Option < MemcachedShardedConfig > ) -> String {
1315
1323
let config = arg. expect ( "missing configuration" ) ;
1316
1324
format ! (
1317
- r#"init=memcachedbench.bin initargs={} appcmd='--x-benchmark-no-run --disable-evictions --conn-limit=128 --threads={} --x-benchmark-mem={} --memory-limit={}'"# ,
1325
+ r#"init=memcachedbench.bin initargs={} appcmd='--x-benchmark-no-run --disable-evictions --conn-limit=1024 --threads={} --x-benchmark-mem={} --memory-limit={}'"# ,
1318
1326
num_cores, num_cores, config. mem_size, config. mem_size
1319
1327
)
1320
1328
}
0 commit comments