Merge pull request #999 from Dohbedoh/enahncement/sg-troubleshooting

Adding FINE logging in SG lookups for easier troubleshooting
jenkinsci · Nov 14, 2024 · 47818f8 · 47818f8
2 parents 048a6fb + cc9dfd3
commit 47818f8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/ec2/SlaveTemplate.java b/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
@@ -1042,6 +1042,7 @@ HashMap<RunInstancesRequest, List<Filter>> makeRunInstancesRequestAndFilters(Ima
         }
 
         String subnetId = chooseSubnetId(rotateSubnet);
+        LOGGER.log(Level.FINE, () -> String.format("Chose subnetId %s", subnetId));
 
         InstanceNetworkInterfaceSpecification net = new InstanceNetworkInterfaceSpecification();
         if (StringUtils.isNotBlank(subnetId)) {
@@ -1436,6 +1437,7 @@ private List<EC2AbstractSlave> provisionSpot(Image image, int number, EnumSet<Pr
 
             InstanceNetworkInterfaceSpecification net = new InstanceNetworkInterfaceSpecification();
             String subnetId = chooseSubnetId();
+            LOGGER.log(Level.FINE, () -> String.format("Chose subnetId %s", subnetId));
             if (StringUtils.isNotBlank(subnetId)) {
                 net.setSubnetId(subnetId);
 
@@ -1692,14 +1694,17 @@ private void updateRemoteTags(AmazonEC2 ec2, Collection<Tag> instTags, String ca
      * Get a list of security group ids for the agent
      */
     private List<String> getEc2SecurityGroups(AmazonEC2 ec2) throws AmazonClientException {
+        LOGGER.log(Level.FINE, () -> String.format("Get security group %s for EC2Cloud %s with currentSubnetId %s",
+            securityGroupSet, this.getParent().name, getCurrentSubnetId()));
         List<String> groupIds = new ArrayList<>();
-
         DescribeSecurityGroupsResult groupResult = getSecurityGroupsBy("group-name", securityGroupSet, ec2);
         if (groupResult.getSecurityGroups().size() == 0) {
             groupResult = getSecurityGroupsBy("group-id", securityGroupSet, ec2);
         }
 
         for (SecurityGroup group : groupResult.getSecurityGroups()) {
+            LOGGER.log(Level.FINE, () -> String.format("Checking security group %s (vpc-id = %s, subnet-id = %s)",
+                group.getGroupId(), group.getVpcId(), getCurrentSubnetId()));
             if (group.getVpcId() != null && !group.getVpcId().isEmpty()) {
                 List<Filter> filters = new ArrayList<>();
                 filters.add(new Filter("vpc-id").withValues(group.getVpcId()));
@@ -1712,6 +1717,7 @@ private List<String> getEc2SecurityGroups(AmazonEC2 ec2) throws AmazonClientExce
 
                 List<Subnet> subnets = subnetResult.getSubnets();
                 if (subnets != null && !subnets.isEmpty()) {
+                    LOGGER.log(Level.FINE, () -> "Adding security group");
                     groupIds.add(group.getGroupId());
                 }
             }