etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logger

This commit is contained in:
nvazquez 2024-06-05 12:20:04 -03:00
parent 27f7a16a84
commit 54037571d8
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java
View File

@ -252,7 +252,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
} catch (Exception e) {
String errMsg = String.format("Unexpected exception while trying to add the external node %s to the Kubernetes cluster %s: %s",
nodeId, kubernetesCluster.getName(), e.getMessage());
LOGGER.error(errMsg, e);
logger.error(errMsg, e);
revertNetworkRules(network, nodeId, sshStartPort);
throw new CloudRuntimeException(e);
}
@ -309,15 +309,15 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
}
private void revertNetworkRules(Network network, long vmId, int port) {
LOGGER.debug(String.format("Reverting network rules for VM ID %s on network %s", vmId, network.getName()));
logger.debug(String.format("Reverting network rules for VM ID %s on network %s", vmId, network.getName()));
FirewallRuleVO ruleVO = firewallRulesDao.findByNetworkIdAndPorts(network.getId(), port, port);
if (Objects.isNull(network.getVpcId())) {
LOGGER.debug(String.format("Removing firewall rule %s", ruleVO.getId()));
logger.debug(String.format("Removing firewall rule %s", ruleVO.getId()));
firewallService.revokeIngressFirewallRule(ruleVO.getId(), true);
}
List<PortForwardingRuleVO> pfRules = portForwardingRulesDao.listByVm(vmId);
for (PortForwardingRuleVO pfRule : pfRules) {
LOGGER.debug(String.format("Removing port forwarding rule %s", pfRule.getId()));
logger.debug(String.format("Removing port forwarding rule %s", pfRule.getId()));
rulesService.revokePortForwardingRule(pfRule.getId(), true);
}
}

2
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java
View File

@ -249,7 +249,7 @@ public class KubernetesClusterDestroyWorker extends KubernetesClusterResourceMod
List<KubernetesClusterVmMapVO> externalNodes = clusterVMs.stream().filter(KubernetesClusterVmMapVO::isExternalNode).collect(Collectors.toList());
if (!externalNodes.isEmpty()) {
String errMsg = String.format("Failed to delete kubernetes cluster %s as there are %s external node(s) present. Please remove the external node(s) from the cluster (and network) or delete them before deleting the cluster.", kubernetesCluster.getName(), externalNodes.size());
LOGGER.error(errMsg);
logger.error(errMsg);
throw new CloudRuntimeException(errMsg);
}
if (network != null) {

4
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
View File

@ -614,8 +614,8 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
} else if (network.getNetworkACLId() != NetworkACL.DEFAULT_ALLOW) {
try {
provisionVpcTierAllowPortACLRule(network, ETCD_NODE_CLIENT_REQUEST_PORT, ETCD_NODE_CLIENT_REQUEST_PORT);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Provisioned ACL rule to open up port %d on %s for etcd nodes for Kubernetes cluster %s",
if (logger.isInfoEnabled()) {
logger.info(String.format("Provisioned ACL rule to open up port %d on %s for etcd nodes for Kubernetes cluster %s",
ETCD_NODE_CLIENT_REQUEST_PORT, publicIpAddress, kubernetesCluster.getName()));
}
} catch (NoSuchFieldException | IllegalAccessException | ResourceUnavailableException | InvalidParameterValueException | PermissionDeniedException e) {