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-05-21 19:59:17 -03:00
parent 535219897d
commit 033a636360
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -178,7 +178,7 @@ public class VirtualRoutingResource {
protected Answer execute(final HandleCksIsoCommand cmd) {
String routerIp = getRouterSshControlIp(cmd);
s_logger.info("Attempting to mount CKS ISO on Virtual Router");
logger.info("Attempting to mount CKS ISO on Virtual Router");
ExecutionResult result = _vrDeployer.executeInVR(routerIp, VRScripts.CKS_ISO_MOUNT_SERVE, String.valueOf(cmd.isMountCksIso()));
return new Answer(cmd, result.isSuccess(), result.getDetails());
}

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

@ -31,7 +31,7 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Level;
import org.apache.logging.log4j.Level;
import javax.inject.Inject;
import java.io.File;
@ -77,7 +77,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
updateKubernetesCluster(kubernetesCluster.getId(), nodesAddedAndMemory);
if (nodeIds.size() != nodesAdded) {
String msg = String.format("Not every node was added to the CKS cluster %s, nodes added: %s out of %s", kubernetesCluster.getUuid(), nodesAdded, nodeIds.size());
LOGGER.info(msg);
logger.info(msg);
detachCksIsoFromNodesAddedToCluster(nodeIds, kubernetesCluster.getId(), mountCksIsoOnVr);
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(),
@ -105,7 +105,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
if (mountCksIsoOnVr) {
detachIsoOnVirtualRouter(kubernetesClusterId);
} else {
LOGGER.info("Detaching CKS ISO from the nodes");
logger.info("Detaching CKS ISO from the nodes");
List<UserVm> vms = nodeIds.stream().map(nodeId -> userVmDao.findById(nodeId)).collect(Collectors.toList());
detachIsoKubernetesVMs(vms);
}
@ -120,7 +120,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
networkService.handleCksIsoOnNetworkVirtualRouter(virtualRouterId, false);
} catch (ResourceUnavailableException e) {
String err = String.format("Error trying to handle ISO %s on virtual router %s", isoId, virtualRouterId);
LOGGER.error(err);
logger.error(err);
throw new CloudRuntimeException(err);
}
@ -128,7 +128,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
templateService.detachIso(virtualRouterId, isoId, true, true);
} catch (CloudRuntimeException e) {
String err = String.format("Error trying to detach ISO %s from virtual router %s", isoId, virtualRouterId);
LOGGER.error(err, e);
logger.error(err, e);
}
}
@ -136,7 +136,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
if (mountCksIsoOnVr) {
attachAndServeIsoOnVirtualRouter(kubernetesClusterId);
} else {
LOGGER.info("Attaching CKS ISO to the nodes");
logger.info("Attaching CKS ISO to the nodes");
List<UserVm> vms = nodeIds.stream().map(nodeId -> userVmDao.findById(nodeId)).collect(Collectors.toList());
attachIsoKubernetesVMs(vms);
}
@ -151,7 +151,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
templateService.attachIso(isoId, virtualRouterId, true, true);
} catch (CloudRuntimeException e) {
String err = String.format("Error trying to attach ISO %s to virtual router %s", isoId, virtualRouterId);
LOGGER.error(err);
logger.error(err);
throw new CloudRuntimeException(err);
}
@ -159,7 +159,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
networkService.handleCksIsoOnNetworkVirtualRouter(virtualRouterId, true);
} catch (ResourceUnavailableException e) {
String err = String.format("Error trying to handle ISO %s on virtual router %s", isoId, virtualRouterId);
LOGGER.error(err);
logger.error(err);
throw new CloudRuntimeException(err);
}
}
@ -192,10 +192,10 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
msg, vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
}
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Failed to add node %s [%s] to Kubernetes cluster : %s", vm.getName(), vm.getUuid(), kubernetesCluster.getName()));
logger.error(String.format("Failed to add node %s [%s] to Kubernetes cluster : %s", vm.getName(), vm.getUuid(), kubernetesCluster.getName()));
}
if (System.currentTimeMillis() > addNodeTimeoutTime) {
LOGGER.error(String.format("Failed to add node %s to Kubernetes cluster : %s", nodeId, kubernetesCluster.getName()));
logger.error(String.format("Failed to add node %s to Kubernetes cluster : %s", nodeId, kubernetesCluster.getName()));
}
nodeIndex = result.second();
}
@ -229,7 +229,7 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
finalNodeIds.add(nodeId);
} catch (ResourceUnavailableException | NetworkRuleConflictException | NoSuchFieldException |
InsufficientCapacityException | IllegalAccessException e) {
LOGGER.error(String.format("Failed to activate API port forwarding rules for the Kubernetes cluster : %s", kubernetesCluster.getName()));
logger.error(String.format("Failed to activate API port forwarding rules for the Kubernetes cluster : %s", kubernetesCluster.getName()));
// remove added Firewall and PF rules
revertNetworkRules(network, nodeId, sshStartPort);
return new Pair<>( false, nodeIndex);
@ -262,12 +262,12 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp.getAddress().addr(), nodeSshPort, getControlNodeLoginUser(),
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Node with ID: %s cannot be added as a worker node as it does not have " +
logger.error(String.format("Node with ID: %s cannot be added as a worker node as it does not have " +
"the following dependencies: %s ", nodeId, result.second()));
return false;
}
} catch (Exception e) {
LOGGER.error(String.format("Failed to validate node with ID: %s", nodeId), e);
logger.error(String.format("Failed to validate node with ID: %s", nodeId), e);
return false;
}
UserVmVO userVm = userVmDao.findById(nodeId);
@ -281,10 +281,10 @@ public class KubernetesClusterAddWorker extends KubernetesClusterActionWorker {
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp.getAddress().addr(), nodeSshPort, getControlNodeLoginUser(),
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Failed to cleanup previous applied userdata on node: %s; This may hamper to addition of the node to the cluster ", userVm.getName()));
logger.error(String.format("Failed to cleanup previous applied userdata on node: %s; This may hamper to addition of the node to the cluster ", userVm.getName()));
}
} catch (Exception e) {
LOGGER.error(String.format("Failed to cleanup previous applied userdata on node: %s; This may hamper to addition of the node to the cluster ", userVm.getName()), e);
logger.error(String.format("Failed to cleanup previous applied userdata on node: %s; This may hamper to addition of the node to the cluster ", userVm.getName()), e);
}
}

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

@ -75,14 +75,14 @@ public class KubernetesClusterRemoveWorker extends KubernetesClusterActionWorker
for (Long nodeId : nodeIds) {
UserVmVO vm = userVmDao.findById(nodeId);
if (vm == null) {
LOGGER.debug(String.format("Couldn't find a VM with ID %s, skipping removal from Kubernetes cluster", nodeId));
logger.debug(String.format("Couldn't find a VM with ID %s, skipping removal from Kubernetes cluster", nodeId));
continue;
}
try {
removeNodeVmFromCluster(nodeId, vm.getDisplayName(), publicIp.getAddress().addr());
result &= removeNodePortForwardingRules(nodeId, network, vm);
if (System.currentTimeMillis() > removeNodeTimeoutTime) {
LOGGER.error(String.format("Removal of node %s from Kubernetes cluster %s timed out", vm.getName(), kubernetesCluster.getName()));
logger.error(String.format("Removal of node %s from Kubernetes cluster %s timed out", vm.getName(), kubernetesCluster.getName()));
result = false;
continue;
}
@ -91,13 +91,13 @@ public class KubernetesClusterRemoveWorker extends KubernetesClusterActionWorker
removedMemory += offeringVO.getRamSize();
removedCores += offeringVO.getCpu();
String description = String.format("Successfully removed the node %s from Kubernetes cluster %s", vm.getUuid(), kubernetesCluster.getUuid());
LOGGER.info(description);
logger.info(description);
ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(),
EventVO.LEVEL_INFO, KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_NODES_REMOVE,
description, vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
} catch (Exception e) {
String err = String.format("Error trying to remove node %s from Kubernetes Cluster %s: %s", vm.getUuid(), kubernetesCluster.getUuid(), e.getMessage());
LOGGER.error(err, e);
logger.error(err, e);
result = false;
}
}
@ -117,7 +117,7 @@ public class KubernetesClusterRemoveWorker extends KubernetesClusterActionWorker
}
} catch (Exception e) {
String err = String.format("Failed to cleanup network rules for node %s, due to: %s", vm.getName(), e.getMessage());
LOGGER.error(err, e);
logger.error(err, e);
}
}
return result;
@ -131,7 +131,7 @@ public class KubernetesClusterRemoveWorker extends KubernetesClusterActionWorker
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp, CLUSTER_NODES_DEFAULT_START_SSH_PORT, getControlNodeLoginUser(),
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Node: %s failed to be gracefully drained as a worker node from cluster %s ", nodeName, kubernetesCluster.getName()));
logger.error(String.format("Node: %s failed to be gracefully drained as a worker node from cluster %s ", nodeName, kubernetesCluster.getName()));
}
List<PortForwardingRuleVO> nodePfRules = portForwardingRulesDao.listByVm(nodeId);
Optional<PortForwardingRuleVO> nodeSshPort = nodePfRules.stream().filter(rule -> rule.getDestinationPortStart() == DEFAULT_SSH_PORT
@ -142,13 +142,13 @@ public class KubernetesClusterRemoveWorker extends KubernetesClusterActionWorker
result = SshHelper.sshExecute(publicIp, nodeSshPort.get().getSourcePortStart(), getControlNodeLoginUser(),
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Failed to reset node: %s from cluster %s ", nodeName, kubernetesCluster.getName()));
logger.error(String.format("Failed to reset node: %s from cluster %s ", nodeName, kubernetesCluster.getName()));
}
command = String.format("%s%s %s %s %s", scriptPath, removeNodeFromClusterScript, nodeName, "control", "delete");
result = SshHelper.sshExecute(publicIp, CLUSTER_NODES_DEFAULT_START_SSH_PORT, getControlNodeLoginUser(),
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
if (Boolean.FALSE.equals(result.first())) {
LOGGER.error(String.format("Node: %s failed to be gracefully delete node from cluster %s ", nodeName, kubernetesCluster.getName()));
logger.error(String.format("Node: %s failed to be gracefully delete node from cluster %s ", nodeName, kubernetesCluster.getName()));
}
}

4
server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View File

@ -6149,7 +6149,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
DomainRouterVO router = routerDao.findById(virtualRouterId);
if (router == null) {
String err = String.format("Cannot find VR with ID %s", virtualRouterId);
s_logger.error(err);
logger.error(err);
throw new CloudRuntimeException(err);
}
Commands commands = new Commands(Command.OnError.Stop);
@ -6159,7 +6159,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
}
Answer answer = commands.getAnswer("handleCksIso");
if (answer == null || !answer.getResult()) {
s_logger.error(String.format("Could not handle the CKS ISO properly: %s", answer.getDetails()));
logger.error(String.format("Could not handle the CKS ISO properly: %s", answer.getDetails()));
return false;
}
return true;