Fix trino commands

Author: gabotechs

benchmarks/cdk/lib/cdk-stack.ts

@@ -7,7 +7,7 @@ import * as cr from 'aws-cdk-lib/custom-resources';
 import { Construct } from 'constructs';
 import * as path from 'path';
 import { execSync } from 'child_process';
-import { trinoAfterDeployCommands, trinoUserDataCommands } from "./trino";
+import { trinoWorkerCommands, trinoUserDataCommands } from "./trino";
 
 const ROOT = path.join(__dirname, '../../..')
 
@@ -188,13 +188,10 @@ sudo journalctl -u worker.service -f -o cat
       'systemctl restart worker',
     ])
 
-    // Start coordinator first
-    sendCommandsUnconditionally(this, 'RestartTrinoCoordinator', [instances[0]], [
-      'systemctl start trino',
-    ])
-
     // Then start workers (they will discover the coordinator)
-    sendCommandsUnconditionally(this, 'RestartTrinoWorkers', instances.slice(1), trinoAfterDeployCommands(this.region))
+    const [coordinator, ...workers] = instances
+    sendCommandsUnconditionally(this, 'TrinoCoordinatorCommands', [coordinator], ['systemctl start trino'])
+    sendCommandsUnconditionally(this, 'TrinoWorkerCommands', workers, trinoWorkerCommands(coordinator))
   }
 }
 

benchmarks/cdk/lib/trino.ts

@@ -1,3 +1,5 @@
+import * as ec2 from 'aws-cdk-lib/aws-ec2';
+
 const TRINO_VERSION = 476
 
 export function trinoUserDataCommands(instanceIndex: number, region: string): string[] {
@@ -94,13 +96,12 @@ TRINO_EOF`,
   ];
 }
 
-export function trinoAfterDeployCommands(region: string) {
+export function trinoWorkerCommands(coordinator: ec2.Instance) {
   return [
-    `COORDINATOR_IP=$(aws ec2 describe-instances --region ${region} --filters "Name=tag:Name,Values=instance-0" "Name=instance-state-name,Values=running" --query "Reservations[0].Instances[0].PrivateIpAddress" --output text)
-cat > /opt/trino-server/etc/config.properties << TRINO_EOF
+    `cat > /opt/trino-server/etc/config.properties << TRINO_EOF
 coordinator=false
 http-server.http.port=8080
-discovery.uri=http://\${COORDINATOR_IP}:8080
+discovery.uri=http://${coordinator.instancePrivateIp}:8080
 TRINO_EOF`,
     'systemctl restart trino',
   ]