Merge pull request #7 from smithmicro/bug-6

fix for issue #6

Author: dsperling

.gitignore

@@ -1,2 +1,3 @@
 .vscode
 logs
+*.jmx

README.md

@@ -3,7 +3,7 @@ JMeter Images for Distributed Testing on EC2 Container Service (ECS)
 
 This application uses two images:
 * `smithmicro/jmeter` - Contains the JMeter software that is deployed in ECS
-* `smithmicro/lucy` - The orcehstration image that can run behind a corporate firewall and manages AWS resources
+* `smithmicro/lucy` - The orchestration image that can run behind a corporate firewall and manages AWS resources
 
 _Warning: Using these Docker images will incur compute and storage costs in AWS.  Care is taken to terminate all instances and volumes after JMeter tests complete, but bugs could allow these resources to continue to run.  See the issues list for more detail._
 

aws-setup.sh

@@ -70,7 +70,7 @@ aws ec2 modify-subnet-attribute --subnet-id $SUBNET_ID --map-public-ip-on-launch
 SG_ID=$(aws ec2 create-security-group --group-name "JMeter" --description "JMeter Security Group" --vpc-id $VPC_ID --output text | tr -d '\n')
 echo "Created Security Group $SG_ID"
 
-JMETER_IP_PERMISSIONS='[{"IpProtocol": "tcp", "FromPort": 22, "ToPort": 22, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 1099, "ToPort": 1099, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 4445, "ToPort": 4445, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 50000, "ToPort": 50000, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 51000, "ToPort": 51000, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]}]'
+JMETER_IP_PERMISSIONS='[{"IpProtocol": "tcp", "FromPort": 22, "ToPort": 22, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 1099, "ToPort": 1099, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "udp", "FromPort": 4445, "ToPort": 4445, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 50000, "ToPort": 50000, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]},{"IpProtocol": "tcp", "FromPort": 51000, "ToPort": 51000, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]}]'
 aws ec2 authorize-security-group-ingress --group-id $SG_ID --ip-permissions "$JMETER_IP_PERMISSIONS"
 
 # tag all created resources

lucy/lucy.sh

@@ -189,9 +189,15 @@ echo "Container instances IDs: $CONTAINER_INSTANCE_IDS"
 
 # Step 6 - Run the Minion task with the requested count
 echo "Running task: $MINION_TASK_DEFINITION, instance count: $MINION_COUNT"
-MINION_TASK_IDS=$(aws ecs run-task --cluster $MINION_CLUSTER_NAME --task-definition $MINION_TASK_DEFINITION --count $MINION_COUNT \
-  --query 'tasks[*].[taskArn]' --output text | tr '\n' ' ')
-
+ECS_MAX=10
+ECS_REMAINING_COUNT=$MINION_COUNT
+while [ $ECS_REMAINING_COUNT -gt 0 ]
+do
+  ECS_REQUEST_COUNT=$(($ECS_REMAINING_COUNT<$ECS_MAX?$ECS_REMAINING_COUNT:$ECS_MAX))
+  MINION_TASK_IDS=$(aws ecs run-task --cluster $MINION_CLUSTER_NAME --task-definition $MINION_TASK_DEFINITION --count $ECS_REQUEST_COUNT \
+    --query 'tasks[*].[taskArn]' --output text | tr '\n' ' ')
+  ECS_REMAINING_COUNT=$((ECS_REMAINING_COUNT-ECS_REQUEST_COUNT))
+done
 echo "Waiting for tasks to run: $MINION_TASK_IDS"
 aws ecs wait tasks-running --cluster $MINION_CLUSTER_NAME --tasks $MINION_TASK_IDS
 if [ "$?" = '0' ]; then
@@ -221,7 +227,7 @@ JMX_IN_COMTAINER=/plans/$(basename $INPUT_JMX)
 ssh -i $PEM_PATH/$KEY_NAME.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ec2-user@${GRU_HOST} \
  "docker run -p 1099:1099 -p 51000:51000 -v /tmp:/plans -v /logs:/logs --env MINION_HOSTS=$MINION_HOSTS smithmicro/jmeter:$JMETER_VERSION $JMX_IN_COMTAINER"
 
-echo "Copying JTL files from Gru"
+echo "Copying results from Gru"
 scp -r -i $PEM_PATH/$KEY_NAME.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ec2-user@${GRU_HOST}:/logs/* /logs
 
 # Step 9 - Stop all tesks