[Bash] Explicitly name GC log files.

aeron-io · Dec 7, 2023 · cbe93c3 · cbe93c3
1 parent 4bbfe02
commit cbe93c3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/scripts/aeron/cluster-backup-node b/scripts/aeron/cluster-backup-node
@@ -19,7 +19,7 @@ set -euxo pipefail
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
-GC_LOG_FILE_NAME="$(basename "${0}" .sh)"
+GC_LOG_FILE_NAME="${GC_LOG_FILE_NAME:-$(basename "${0}" .sh)}"
 export GC_LOG_FILE_NAME
 
 exec "${DIR}/../run-java" \

diff --git a/scripts/aeron/cluster-client b/scripts/aeron/cluster-client
@@ -19,7 +19,7 @@ set -euxo pipefail
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
-GC_LOG_FILE_NAME="$(basename "${0}" .sh)"
+GC_LOG_FILE_NAME="${GC_LOG_FILE_NAME:-$(basename "${0}" .sh)}"
 export GC_LOG_FILE_NAME
 export JVM_OPTS="${JVM_OPTS:-} \
 -Duk.co.real_logic.benchmarks.remote.message.transceiver=uk.co.real_logic.benchmarks.aeron.remote.ClusterMessageTransceiver"

diff --git a/scripts/aeron/cluster-node b/scripts/aeron/cluster-node
@@ -19,7 +19,7 @@ set -euxo pipefail
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
-GC_LOG_FILE_NAME="$(basename "${0}" .sh)"
+GC_LOG_FILE_NAME="${GC_LOG_FILE_NAME:-$(basename "${0}" .sh)}"
 export GC_LOG_FILE_NAME
 
 exec "${DIR}/../run-java" \

diff --git a/scripts/aeron/remote-cluster-benchmarks b/scripts/aeron/remote-cluster-benchmarks
@@ -234,7 +234,7 @@ function start_cluster_node()
   local clustered_service_cpu_var=NODE${node_id}_CLUSTERED_SERVICE_CPU_CORE
   local extra_properties_var=NODE${node_id}_EXTRA_PROPERTIES
   echo "
-    export JAVA_HOME=\"${!java_home_var}\" \
+    export JAVA_HOME=\"${!java_home_var}\" GC_LOG_FILE_NAME=\"cluster-node-${node_id}-media-driver\" \
     ; $(kill_java_process "${cluster_node_class_name}") \
     ; rm -rf \"${!cluster_dir_var}\" \
     ; rm -rf \"${!archive_dir_var}\" \
@@ -260,7 +260,7 @@ function start_cluster_node()
     -Daeron.archive.recording.events.enabled=false \
     -Duk.co.real_logic.benchmarks.aeron.remote.cluster.service=${cluster_service} \
     -Duk.co.real_logic.benchmarks.remote.output.directory=${output_dir} \
-    ${!extra_properties_var:-}\" \
+    ${!extra_properties_var:-}\" GC_LOG_FILE_NAME=\"cluster-node-${node_id}\" \
     && numactl --membind=${!cpu_node_var} --cpunodebind=${!cpu_node_var} --physcpubind=\"${!non_isolated_cpu_cores_var}\" ${!benchmarks_path_var}/scripts/aeron/cluster-node & \
     $(await_java_process_start "${cluster_node_class_name}") \
     ; $(pin_thread \${pid} "archive-recorde" "${!archive_recorder_cpu_var}") \
@@ -294,7 +294,7 @@ function start_cluster_backup_node()
   local archive_conductor_cpu_var=BACKUP_NODE${node_id}_ARCHIVE_CONDUCTOR_CPU_CORE
   local cluster_backup_cpu_var=BACKUP_NODE${node_id}_CLUSTER_BACKUP_CPU_CORE
   echo "
-    export JAVA_HOME=\"${!java_home_var}\" \
+    export JAVA_HOME=\"${!java_home_var}\" GC_LOG_FILE_NAME=\"cluster-backup-node-${node_id}-media-driver\" \
     ; $(kill_java_process "${cluster_backup_node_class_name}") \
     ; rm -rf \"${!cluster_dir_var}\" \
     ; rm -rf \"${!archive_dir_var}\" \
@@ -315,7 +315,7 @@ function start_cluster_backup_node()
     -Daeron.archive.file.sync.level=${fsync} \
     -Daeron.archive.catalog.file.sync.level=${fsync} \
     -Daeron.archive.recording.events.enabled=false \
-    -Duk.co.real_logic.benchmarks.remote.output.directory=${output_dir}\" \
+    -Duk.co.real_logic.benchmarks.remote.output.directory=${output_dir}\" GC_LOG_FILE_NAME=\"cluster-backup-node-${node_id}\"\
     && numactl --membind=${!cpu_node_var} --cpunodebind=${!cpu_node_var} --physcpubind=\"${!non_isolated_cpu_cores_var}\" ${!benchmarks_path_var}/scripts/aeron/cluster-backup-node & \
     $(await_java_process_start "${cluster_backup_node_class_name}") \
     ; $(pin_thread \${pid} "archive-recorde" "${!archive_recorder_cpu_var}") \
@@ -490,7 +490,7 @@ do
             -Daeron.cluster.egress.channel=${CLIENT_EGRESS_CHANNEL}\
             -Daeron.cluster.message.timeout=300000000000\
             ${CLIENT_EXTRA_PROPERTIES:-}\"\
-            && export JAVA_HOME=\"${CLIENT_JAVA_HOME}\"\
+            && export JAVA_HOME=\"${CLIENT_JAVA_HOME}\" GC_LOG_FILE_NAME=\"cluster-client-media-driver\"\
             ; $(kill_java_process "${client_class_name}")\
             ; ${client_driver}\
             && numactl --membind=${CLIENT_CPU_NODE} --cpunodebind=${CLIENT_CPU_NODE} --physcpubind=\"${CLIENT_NON_ISOLATED_CPU_CORES}\" ${CLIENT_BENCHMARKS_PATH}/scripts/aeron/${client_script} & \

diff --git a/scripts/aeron/remote-live-recording-benchmarks b/scripts/aeron/remote-live-recording-benchmarks
@@ -261,7 +261,7 @@ do
       fi
 
       start_client="\
-      export JAVA_HOME=\"${CLIENT_JAVA_HOME}\" \
+      export JAVA_HOME=\"${CLIENT_JAVA_HOME}\" GC_LOG_FILE_NAME=\"live-recording-client-media-driver\"\
       ; $(kill_java_process "${client_class_name}") \
       ; ${client_driver} \
       && numactl --membind=${CLIENT_CPU_NODE} --cpunodebind=${CLIENT_CPU_NODE} --physcpubind=\"${CLIENT_NON_ISOLATED_CPU_CORES}\" ${CLIENT_BENCHMARKS_PATH}/scripts/aeron/live-recording-client & \
@@ -273,7 +273,7 @@ do
       && tail --pid=\$! -f /dev/null && kill -9 \${media_driver_pid}; wait"
 
       start_server="\
-      export JAVA_HOME=\"${SERVER_JAVA_HOME}\" \
+      export JAVA_HOME=\"${SERVER_JAVA_HOME}\" GC_LOG_FILE_NAME=\"echo-node-media-driver\"\
       ; $(kill_java_process "${server_class_name}") \
       ; ${server_driver} \
       && numactl --membind=${SERVER_CPU_NODE} --cpunodebind=${SERVER_CPU_NODE} --physcpubind=\"${SERVER_NON_ISOLATED_CPU_CORES}\" ${SERVER_BENCHMARKS_PATH}/scripts/aeron/echo-server & \

diff --git a/scripts/aeron/remote-live-replay-benchmarks b/scripts/aeron/remote-live-replay-benchmarks
@@ -260,7 +260,7 @@ do
       fi
 
       start_client="\
-      export JAVA_HOME=\"${CLIENT_JAVA_HOME}\" \
+      export JAVA_HOME=\"${CLIENT_JAVA_HOME}\" GC_LOG_FILE_NAME=\"live-replay-client-media-driver\"\
       ; $(kill_java_process "${client_class_name}") \
       ; ${client_driver} \
       && numactl --membind=${CLIENT_CPU_NODE} --cpunodebind=${CLIENT_CPU_NODE} --physcpubind=\"${CLIENT_NON_ISOLATED_CPU_CORES}\" ${CLIENT_BENCHMARKS_PATH}/scripts/aeron/live-replay-client & \
@@ -269,7 +269,7 @@ do
       && tail --pid=\$! -f /dev/null && kill -9 \${media_driver_pid}; wait"
 
       start_server="\
-      export JAVA_HOME=\"${SERVER_JAVA_HOME}\" \
+      export JAVA_HOME=\"${SERVER_JAVA_HOME}\" GC_LOG_FILE_NAME=\"live-replay-server-media-driver\"\
       ; $(kill_java_process "${server_class_name}") \
       ; ${server_driver} \
       && numactl --membind=${SERVER_CPU_NODE} --cpunodebind=${SERVER_CPU_NODE} --physcpubind=\"${SERVER_NON_ISOLATED_CPU_CORES}\" ${SERVER_BENCHMARKS_PATH}/scripts/aeron/live-replay-server & \