From 66168ac049688fdd0448a407cf5d27efb6507dc3 Mon Sep 17 00:00:00 2001 From: Peter Veentjer Date: Fri, 20 Jun 2025 10:28:09 +0300 Subject: [PATCH] Fixes issue with empty server_driver_async_executor_cpu_core_var This variable isn't filled by an environment variable because async executor pinning has been deleted. Currently I'm getting: remote-cluster-benchmarks: line 566: server_driver_async_executor_cpu_core_var: invalid indirect expansion --- scripts/aeron/remote-cluster-benchmarks | 2 -- scripts/aeron/remote-echo-mdc-benchmarks | 1 - 2 files changed, 3 deletions(-) diff --git a/scripts/aeron/remote-cluster-benchmarks b/scripts/aeron/remote-cluster-benchmarks index a2ad1cf3..398c91aa 100755 --- a/scripts/aeron/remote-cluster-benchmarks +++ b/scripts/aeron/remote-cluster-benchmarks @@ -563,7 +563,6 @@ do server_driver="${server_driver//driver_conductor_cpu_core_var/${!server_driver_conductor_cpu_core}}" server_driver="${server_driver//driver_sender_cpu_core_var/${!server_driver_sender_cpu_core}}" server_driver="${server_driver//driver_receiver_cpu_core_var/${!server_driver_receiver_cpu_core}}" - server_driver="${server_driver//driver_async_executor_cpu_core_var/${!server_driver_async_executor_cpu_core_var}}" server_driver="${server_driver//driver_aeron_dpdk_gateway_ipv4_address_var/${!server_driver_aeron_dpdk_gateway_ipv4_address}}" server_driver="${server_driver//driver_aeron_dpdk_local_ipv4_address_var/${!server_driver_aeron_dpdk_local_ipv4_address}}" execute_remote_command "${!ssh_user}" "${!ssh_key_file}" "${!ssh_node}" "($(start_cluster_node "${n}" "${cluster_node_class_name}" "${server_driver}" "${fsync}" "${cluster_service}" "${!server_benchmarks_path}/${output_dir}") &) > /tmp/benchmarks-cluster-node-${n}.log 2>&1 && exit" @@ -588,7 +587,6 @@ do server_driver="${server_driver//driver_conductor_cpu_core_var/${!server_driver_conductor_cpu_core}}" server_driver="${server_driver//driver_sender_cpu_core_var/${!server_driver_sender_cpu_core}}" server_driver="${server_driver//driver_receiver_cpu_core_var/${!server_driver_receiver_cpu_core}}" - server_driver="${server_driver//driver_async_executor_cpu_core_var/${!server_driver_async_executor_cpu_core_var}}" server_driver="${server_driver//driver_aeron_dpdk_gateway_ipv4_address_var/${!server_driver_aeron_dpdk_gateway_ipv4_address}}" server_driver="${server_driver//driver_aeron_dpdk_local_ipv4_address_var/${!server_driver_aeron_dpdk_local_ipv4_address}}" execute_remote_command "${!ssh_user}" "${!ssh_key_file}" "${!ssh_node}" "($(start_cluster_backup_node "${n}" "${cluster_backup_node_class_name}" "${server_driver}" "${!server_benchmarks_path}/${output_dir}") &) > /tmp/benchmarks-cluster-backup-node-${n}.log 2>&1 && exit" diff --git a/scripts/aeron/remote-echo-mdc-benchmarks b/scripts/aeron/remote-echo-mdc-benchmarks index e777fb0d..4ed29d02 100755 --- a/scripts/aeron/remote-echo-mdc-benchmarks +++ b/scripts/aeron/remote-echo-mdc-benchmarks @@ -425,7 +425,6 @@ do server_driver="${server_driver//driver_conductor_cpu_core_var/${!server_driver_conductor_cpu_core}}" server_driver="${server_driver//driver_sender_cpu_core_var/${!server_driver_sender_cpu_core}}" server_driver="${server_driver//driver_receiver_cpu_core_var/${!server_driver_receiver_cpu_core}}" - server_driver="${server_driver//driver_async_executor_cpu_core_var/${!server_driver_async_executor_cpu_core_var}}" server_driver="${server_driver//driver_aeron_dpdk_gateway_ipv4_address_var/${!server_driver_aeron_dpdk_gateway_ipv4_address}}" server_driver="${server_driver//driver_aeron_dpdk_local_ipv4_address_var/${!server_driver_aeron_dpdk_local_ipv4_address}}" execute_remote_command "${!ssh_user}" "${!ssh_key_file}" "${!ssh_node}" "($(start_node "${n}" "${node_class_name}" "${server_driver}" "${!server_benchmarks_path}/${output_dir}") &) > /tmp/benchmarks-node-${n}.log 2>&1 && exit"