Merge branch 'main' of github.com:johnramsden/OxCache

Author: johnramsden

cortes.server.block.toml

@@ -3,8 +3,8 @@ log_level = "info"
 [server]
 socket = "/tmp/oxcache.sock"
 disk = "/dev/nvme1n1"
-writer_threads = 14
-reader_threads = 14
+writer_threads = 64
+reader_threads = 64
 chunk_size = 65536
 block_zone_capacity = 1129316352
 max_write_size = 262144
@@ -24,4 +24,5 @@ eviction_interval_ms = 1000  # Evict every 1s
 [metrics]
 ip_addr = "127.0.0.1"
 port = 9000
-file_metrics_directory = "./logs"
+file_metrics_directory = "./logs"
+eviction_metrics = true

cortes.server.zns.toml

@@ -3,8 +3,8 @@ log_level = "info"
 [server]
 socket = "/tmp/oxcache.sock"
 disk = "/dev/nvme0n2"
-writer_threads = 14
-reader_threads = 14
+writer_threads = 64
+reader_threads = 64
 chunk_size = 1048576
 block_zone_capacity = 1129316352
 max_write_size = 262144
@@ -24,4 +24,5 @@ eviction_interval_ms = 1000  # Evict every 1s
 [metrics]
 ip_addr = "127.0.0.1"
 port = 9000
-file_metrics_directory = "./logs"
+file_metrics_directory = "./logs"
+eviction_metrics = true

oxcache/src/server.rs

@@ -459,7 +459,8 @@ async fn handle_connection<T: RemoteBackend + Send + Sync + 'static>(
                                     METRICS.update_metric_histogram_latency("get_hit_latency_ms", start.elapsed(), MetricType::MsLatency);
                                     METRICS.update_metric_counter("hit", 1);
                                     METRICS.update_hitratio(HitType::Hit);
-                                    METRICS.update_metric_counter("written_bytes_total", chunk.size);
+                                    METRICS.update_metric_counter("read_bytes_total", chunk.size);
+                                    METRICS.update_metric_counter("bytes_total", chunk.size);
                                     tracing::debug!("REQ[{}] CACHE HIT completed successfully", request_id);
                                     Ok(())
                                 }
@@ -541,7 +542,8 @@ async fn handle_connection<T: RemoteBackend + Send + Sync + 'static>(
                                     METRICS.update_metric_counter("miss", 1);
                                     METRICS.update_metric_histogram_latency("get_miss_latency_ms", start.elapsed(), MetricType::MsLatency);
                                     METRICS.update_hitratio(HitType::Miss);
-                                    METRICS.update_metric_counter("read_bytes_total", chunk_size);
+                                    METRICS.update_metric_counter("written_bytes_total", chunk_size);
+                                    METRICS.update_metric_counter("bytes_total", chunk_size);
                                     tracing::debug!("REQ[{}] CACHE MISS completed successfully", request_id);
                                     Ok(write_response)
                                 }
@@ -551,7 +553,6 @@ async fn handle_connection<T: RemoteBackend + Send + Sync + 'static>(
                             std::io::Error::new(std::io::ErrorKind::Other, format!("cache.get_or_insert_with failed: {}", e))
                         })?;
                         tracing::debug!("REQ[{}] Request completed successfully", request_id);
-                        METRICS.update_metric_counter("bytes_total", chunk_size);
                     }
                     request::Request::Close => {
                         tracing::debug!("Received close request");

scripts/run_cpu_bench.sh

@@ -3,6 +3,8 @@
 
 set -e
 
+ulimit -n 65535
+
 # Get the directory in which this script is located:
 SCRIPT_DIR="$(cd "$(dirname "$0")" || exit 1; pwd)"
 

scripts/run_cpu_bench_spc.sh

@@ -8,40 +8,36 @@ ulimit -n 65535
 # Get the directory in which this script is located:
 SCRIPT_DIR="$(cd "$(dirname "$0")" || exit 1; pwd)"
 
-# Source workloads
-. "${SCRIPT_DIR}/spcconfigspace.sh"
-
 # Cleanup function to kill server if it's running
 cleanup() {
     if [ -n "$SERVER_PID" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
         echo "Cleaning up server PID $SERVER_PID"
         kill "$SERVER_PID"
         wait "$SERVER_PID" 2>/dev/null || true
     fi
-#    if [ -n "$PIDSTAT_PID" ] && kill -0 "$PIDSTAT_PID" 2>/dev/null; then
-#        echo "Cleaning up pidstat PID $PIDSTAT_PID"
-#        kill "$PIDSTAT_PID"
-#        wait "$PIDSTAT_PID" 2>/dev/null || true
-#    fi
 }
 
 # Set trap to cleanup on script exit
 trap cleanup EXIT INT TERM
 
 usage() {
-    printf "Usage: %s TRACE CONFIGFILE DEVICE\n" "$(basename "$0")"
+    printf "Usage: %s TRACE SPCCONFIGSPACE CONFIGFILE DEVICE\n" "$(basename "$0")"
     exit 1
 }
 
 # Check that exactly 4 positional arguments remain
-if [ "$#" -ne 3 ]; then
-    echo "Illegal number of parameters $#, should be 2"
+if [ "$#" -ne 4 ]; then
+    echo "Illegal number of parameters $#, should be 3"
     usage
 fi
 
 trace="$(realpath "$1")"
 configfile="$2"
-device="$3"
+spcconfigspace="$3"
+device="$4"
+
+# Source workloads
+. "${spcconfigspace}"
 
 echo "Logging to: ./logs"
 echo "Configfile: $configfile"
@@ -70,17 +66,13 @@ for tracecfg in "${workloads[@]}"; do
         declare -g "$key"="$value"
     done
 
-    runfile="./logs/$chunk_size,L=$latency,$distr,R=$ratio,I=$iterations,NZ=$n_zones,$eviction,${device##*/}-$(date '+%d_%H:%M:%S')-run"
+    runfile="./logs/$chunk_size,L=$latency,NZ=$n_zones,$eviction,${device##*/}-$(date '+%d_%H:%M:%S')-run"
     # Now you can access the variables
     {
         echo "Chunk Size: $chunk_size"
         echo "Latency: $latency"
-        echo "Distribution Type: $distr"
-        echo "Working Set Ratio: $ratio"
         echo "Zone Size: $zone_size"
-        echo "Iterations: $iterations"
         echo "Number of Zones: $n_zones"
-        echo "Total Chunks: $chunks"
         echo "High Water: $evict_high"
         echo "Low water: $evict_low"
         echo "Eviction $eviction"
@@ -165,11 +157,15 @@ for tracecfg in "${workloads[@]}"; do
         tail -n3 "$runfile.client"
     fi
 
-    sleep 10s
-
-#    tar -czf "./logs-compressed/$(basename "$runfile.tar.gz")" ./logs
-#    rm -rf ./logs/*
+   tar -czf "./logs-compressed/$(basename "$runfile.tar.gz")" ./logs
+   rm -rf ./logs/*
 
 done
 
+logsdir="./logs-compressed-$(date '+%d_%H:%M:%S')"
+
+mkdir -p "${logsdir}"
+
+mv ./logs-compressed/* "${logsdir}"
+
 exit $ret

scripts/spcconfigspace.block.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# BLOCK
+workloads=(
+    'chunk_size=1129316352,latency=5413781,evict_high=2,evict_low=3,eviction=promotional,n_zones=904,t=64,zone_size=1129316352'
+    'chunk_size=268435456,latency=3209583,evict_high=2,evict_low=6,eviction=promotional,n_zones=904,t=256,zone_size=1129316352'
+    'chunk_size=268435456,latency=3209583,evict_high=5,evict_low=37,eviction=chunk,n_zones=904,t=256,clean_low=0,zone_size=1129316352'
+    'chunk_size=65536,latency=40632,evict_high=17233,evict_low=86161,eviction=chunk,n_zones=904,t=1024,clean_low=0,zone_size=1129316352'
+    'chunk_size=65536,latency=40632,evict_high=5,evict_low=9,eviction=promotional,n_zones=904,t=1024,zone_size=1129316352'
+)

scripts/spcconfigspace.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# ZONED
+workloads=(
+    'chunk_size=1129316352,latency=5413781,evict_high=9,evict_low=13,eviction=promotional,n_zones=904,t=64,zone_size=1129316352'
+    'chunk_size=268435456,latency=3209583,evict_high=5,evict_low=37,eviction=chunk,n_zones=904,t=256,clean_low=24,zone_size=1129316352'
+    'chunk_size=268435456,latency=3209583,evict_high=9,evict_low=17,eviction=promotional,n_zones=904,t=256,zone_size=1129316352'
+    'chunk_size=65536,latency=40632,evict_high=2,evict_low=10,eviction=promotional,n_zones=904,t=1024,zone_size=1129316352'
+    'chunk_size=65536,latency=40632,evict_high=68929,evict_low=206785,eviction=chunk,n_zones=904,t=1024,clean_low=68928,zone_size=1129316352'
+)