@@ -798,12 +798,12 @@ fn rackscale_memcached_checkout() {
798798 }
799799
800800 println ! (
801- "CHECKOUT 9a549169d0c6b8a33503a9615f636d5ced8d87d1 {:?}" ,
801+ "CHECKOUT fe0eb024882481717efd6a3f4600e96c99ca77a2 {:?}" ,
802802 out_dir
803803 ) ;
804804
805805 let res = Command :: new ( "git" )
806- . args ( & [ "checkout" , "9a549169d0c6b8a33503a9615f636d5ced8d87d1 " ] )
806+ . args ( & [ "checkout" , "fe0eb024882481717efd6a3f4600e96c99ca77a2 " ] )
807807 . current_dir ( out_dir_path. as_path ( ) )
808808 . output ( )
809809 . expect ( "git checkout failed" ) ;
@@ -988,8 +988,12 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
988988 continue ;
989989 }
990990
991+ println ! ( "" ) ;
992+
991993 config. num_threads = num_threads;
992994
995+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
996+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
993997 let mut pty = run_benchmark_internal ( & config, timeout_ms) ;
994998 let mut output = String :: new ( ) ;
995999 let res =
@@ -1009,10 +1013,13 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
10091013 for protocol in & [ "tcp" , "unix" ] {
10101014 config. protocol = protocol;
10111015
1016+ println ! ( "" ) ;
1017+
10121018 println ! ( "Memcached Sharded: {num_threads}x{num_nodes} with {protocol}" ) ;
10131019
10141020 // terminate the memcached instance
10151021 let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
1022+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
10161023
10171024 let mut memcached_ctrls = Vec :: new ( ) ;
10181025 for i in 0 ..num_nodes {
@@ -1073,6 +1080,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
10731080 println ! ( "MEMCACHED-OUTPUT: {}" , l) ;
10741081 }
10751082 }
1083+ let _ = Command :: new ( "killall" ) . args ( & [ "memcached" ] ) . status ( ) ;
10761084 }
10771085 } ;
10781086 }
@@ -1314,7 +1322,7 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
13141322 fn cmd_fn ( num_cores : usize , arg : Option < MemcachedShardedConfig > ) -> String {
13151323 let config = arg. expect ( "missing configuration" ) ;
13161324 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={}'"# ,
13181326 num_cores, num_cores, config. mem_size, config. mem_size
13191327 )
13201328 }
0 commit comments