Skip to content

Commit 033a636

Browse files
nvazqueznvazquez
committed
Fix logger
1 parent 5352198 commit 033a636

4 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public Answer executeRequest(final NetworkElementCommand cmd) {
178178

179179
protected Answer execute(final HandleCksIsoCommand cmd) {
180180
String routerIp = getRouterSshControlIp(cmd);
181-
s_logger.info("Attempting to mount CKS ISO on Virtual Router");
181+
logger.info("Attempting to mount CKS ISO on Virtual Router");
182182
ExecutionResult result = _vrDeployer.executeInVR(routerIp, VRScripts.CKS_ISO_MOUNT_SERVE, String.valueOf(cmd.isMountCksIso()));
183183
return new Answer(cmd, result.isSuccess(), result.getDetails());
184184
}

‎plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
3232
import org.apache.cloudstack.context.CallContext;
3333
import org.apache.commons.codec.binary.Base64;
34-
import org.apache.log4j.Level;
34+
import org.apache.logging.log4j.Level;
3535

3636
import javax.inject.Inject;
3737
import java.io.File;
@@ -77,7 +77,7 @@ public boolean addNodesToCluster(List<Long> nodeIds, boolean mountCksIsoOnVr) th
7777
updateKubernetesCluster(kubernetesCluster.getId(), nodesAddedAndMemory);
7878
if (nodeIds.size() != nodesAdded) {
7979
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());
80-
LOGGER.info(msg);
80+
logger.info(msg);
8181
detachCksIsoFromNodesAddedToCluster(nodeIds, kubernetesCluster.getId(), mountCksIsoOnVr);
8282
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
8383
ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(),
@@ -105,7 +105,7 @@ private void detachCksIsoFromNodesAddedToCluster(List<Long> nodeIds, long kubern
105105
if (mountCksIsoOnVr) {
106106
detachIsoOnVirtualRouter(kubernetesClusterId);
107107
} else {
108-
LOGGER.info("Detaching CKS ISO from the nodes");
108+
logger.info("Detaching CKS ISO from the nodes");
109109
List<UserVm> vms = nodeIds.stream().map(nodeId -> userVmDao.findById(nodeId)).collect(Collectors.toList());
110110
detachIsoKubernetesVMs(vms);
111111
}
@@ -120,23 +120,23 @@ public void detachIsoOnVirtualRouter(Long kubernetesClusterId) {
120120
networkService.handleCksIsoOnNetworkVirtualRouter(virtualRouterId, false);
121121
} catch (ResourceUnavailableException e) {
122122
String err = String.format("Error trying to handle ISO %s on virtual router %s", isoId, virtualRouterId);
123-
LOGGER.error(err);
123+
logger.error(err);
124124
throw new CloudRuntimeException(err);
125125
}
126126

127127
try {
128128
templateService.detachIso(virtualRouterId, isoId, true, true);
129129
} catch (CloudRuntimeException e) {
130130
String err = String.format("Error trying to detach ISO %s from virtual router %s", isoId, virtualRouterId);
131-
LOGGER.error(err, e);
131+
logger.error(err, e);
132132
}
133133
}
134134

135135
public void attachCksIsoForNodesAdditionToCluster(List<Long> nodeIds, Long kubernetesClusterId, boolean mountCksIsoOnVr) {
136136
if (mountCksIsoOnVr) {
137137
attachAndServeIsoOnVirtualRouter(kubernetesClusterId);
138138
} else {
139-
LOGGER.info("Attaching CKS ISO to the nodes");
139+
logger.info("Attaching CKS ISO to the nodes");
140140
List<UserVm> vms = nodeIds.stream().map(nodeId -> userVmDao.findById(nodeId)).collect(Collectors.toList());
141141
attachIsoKubernetesVMs(vms);
142142
}
@@ -151,15 +151,15 @@ public void attachAndServeIsoOnVirtualRouter(Long kubernetesClusterId) {
151151
templateService.attachIso(isoId, virtualRouterId, true, true);
152152
} catch (CloudRuntimeException e) {
153153
String err = String.format("Error trying to attach ISO %s to virtual router %s", isoId, virtualRouterId);
154-
LOGGER.error(err);
154+
logger.error(err);
155155
throw new CloudRuntimeException(err);
156156
}
157157

158158
try {
159159
networkService.handleCksIsoOnNetworkVirtualRouter(virtualRouterId, true);
160160
} catch (ResourceUnavailableException e) {
161161
String err = String.format("Error trying to handle ISO %s on virtual router %s", isoId, virtualRouterId);
162-
LOGGER.error(err);
162+
logger.error(err);
163163
throw new CloudRuntimeException(err);
164164
}
165165
}
@@ -192,10 +192,10 @@ private Ternary<Integer, Long, Long> importNodeToCluster(List<Long> nodeIds, Net
192192
msg, vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
193193
}
194194
if (Boolean.FALSE.equals(result.first())) {
195-
LOGGER.error(String.format("Failed to add node %s [%s] to Kubernetes cluster : %s", vm.getName(), vm.getUuid(), kubernetesCluster.getName()));
195+
logger.error(String.format("Failed to add node %s [%s] to Kubernetes cluster : %s", vm.getName(), vm.getUuid(), kubernetesCluster.getName()));
196196
}
197197
if (System.currentTimeMillis() > addNodeTimeoutTime) {
198-
LOGGER.error(String.format("Failed to add node %s to Kubernetes cluster : %s", nodeId, kubernetesCluster.getName()));
198+
logger.error(String.format("Failed to add node %s to Kubernetes cluster : %s", nodeId, kubernetesCluster.getName()));
199199
}
200200
nodeIndex = result.second();
201201
}
@@ -229,7 +229,7 @@ private Pair<Boolean, Integer> validateAndSetupNode(Network network, IpAddress p
229229
finalNodeIds.add(nodeId);
230230
} catch (ResourceUnavailableException | NetworkRuleConflictException | NoSuchFieldException |
231231
InsufficientCapacityException | IllegalAccessException e) {
232-
LOGGER.error(String.format("Failed to activate API port forwarding rules for the Kubernetes cluster : %s", kubernetesCluster.getName()));
232+
logger.error(String.format("Failed to activate API port forwarding rules for the Kubernetes cluster : %s", kubernetesCluster.getName()));
233233
// remove added Firewall and PF rules
234234
revertNetworkRules(network, nodeId, sshStartPort);
235235
return new Pair<>( false, nodeIndex);
@@ -262,12 +262,12 @@ private boolean validateNodeCompatibility(IpAddress publicIp, long nodeId, int n
262262
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp.getAddress().addr(), nodeSshPort, getControlNodeLoginUser(),
263263
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
264264
if (Boolean.FALSE.equals(result.first())) {
265-
LOGGER.error(String.format("Node with ID: %s cannot be added as a worker node as it does not have " +
265+
logger.error(String.format("Node with ID: %s cannot be added as a worker node as it does not have " +
266266
"the following dependencies: %s ", nodeId, result.second()));
267267
return false;
268268
}
269269
} catch (Exception e) {
270-
LOGGER.error(String.format("Failed to validate node with ID: %s", nodeId), e);
270+
logger.error(String.format("Failed to validate node with ID: %s", nodeId), e);
271271
return false;
272272
}
273273
UserVmVO userVm = userVmDao.findById(nodeId);
@@ -281,10 +281,10 @@ private void cleanupCloudInitSemFolder(UserVm userVm, IpAddress publicIp, File p
281281
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp.getAddress().addr(), nodeSshPort, getControlNodeLoginUser(),
282282
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
283283
if (Boolean.FALSE.equals(result.first())) {
284-
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()));
284+
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()));
285285
}
286286
} catch (Exception e) {
287-
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);
287+
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);
288288
}
289289
}
290290

‎plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterRemoveWorker.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ private boolean removeNodesFromCluster(List<Long> nodeIds, Network network, IpAd
7575
for (Long nodeId : nodeIds) {
7676
UserVmVO vm = userVmDao.findById(nodeId);
7777
if (vm == null) {
78-
LOGGER.debug(String.format("Couldn't find a VM with ID %s, skipping removal from Kubernetes cluster", nodeId));
78+
logger.debug(String.format("Couldn't find a VM with ID %s, skipping removal from Kubernetes cluster", nodeId));
7979
continue;
8080
}
8181
try {
8282
removeNodeVmFromCluster(nodeId, vm.getDisplayName(), publicIp.getAddress().addr());
8383
result &= removeNodePortForwardingRules(nodeId, network, vm);
8484
if (System.currentTimeMillis() > removeNodeTimeoutTime) {
85-
LOGGER.error(String.format("Removal of node %s from Kubernetes cluster %s timed out", vm.getName(), kubernetesCluster.getName()));
85+
logger.error(String.format("Removal of node %s from Kubernetes cluster %s timed out", vm.getName(), kubernetesCluster.getName()));
8686
result = false;
8787
continue;
8888
}
@@ -91,13 +91,13 @@ private boolean removeNodesFromCluster(List<Long> nodeIds, Network network, IpAd
9191
removedMemory += offeringVO.getRamSize();
9292
removedCores += offeringVO.getCpu();
9393
String description = String.format("Successfully removed the node %s from Kubernetes cluster %s", vm.getUuid(), kubernetesCluster.getUuid());
94-
LOGGER.info(description);
94+
logger.info(description);
9595
ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(),
9696
EventVO.LEVEL_INFO, KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_NODES_REMOVE,
9797
description, vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
9898
} catch (Exception e) {
9999
String err = String.format("Error trying to remove node %s from Kubernetes Cluster %s: %s", vm.getUuid(), kubernetesCluster.getUuid(), e.getMessage());
100-
LOGGER.error(err, e);
100+
logger.error(err, e);
101101
result = false;
102102
}
103103
}
@@ -117,7 +117,7 @@ protected boolean removeNodePortForwardingRules(Long nodeId, Network network, Us
117117
}
118118
} catch (Exception e) {
119119
String err = String.format("Failed to cleanup network rules for node %s, due to: %s", vm.getName(), e.getMessage());
120-
LOGGER.error(err, e);
120+
logger.error(err, e);
121121
}
122122
}
123123
return result;
@@ -131,7 +131,7 @@ private void removeNodeVmFromCluster(Long nodeId, String nodeName, String public
131131
Pair<Boolean, String> result = SshHelper.sshExecute(publicIp, CLUSTER_NODES_DEFAULT_START_SSH_PORT, getControlNodeLoginUser(),
132132
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
133133
if (Boolean.FALSE.equals(result.first())) {
134-
LOGGER.error(String.format("Node: %s failed to be gracefully drained as a worker node from cluster %s ", nodeName, kubernetesCluster.getName()));
134+
logger.error(String.format("Node: %s failed to be gracefully drained as a worker node from cluster %s ", nodeName, kubernetesCluster.getName()));
135135
}
136136
List<PortForwardingRuleVO> nodePfRules = portForwardingRulesDao.listByVm(nodeId);
137137
Optional<PortForwardingRuleVO> nodeSshPort = nodePfRules.stream().filter(rule -> rule.getDestinationPortStart() == DEFAULT_SSH_PORT
@@ -142,13 +142,13 @@ private void removeNodeVmFromCluster(Long nodeId, String nodeName, String public
142142
result = SshHelper.sshExecute(publicIp, nodeSshPort.get().getSourcePortStart(), getControlNodeLoginUser(),
143143
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
144144
if (Boolean.FALSE.equals(result.first())) {
145-
LOGGER.error(String.format("Failed to reset node: %s from cluster %s ", nodeName, kubernetesCluster.getName()));
145+
logger.error(String.format("Failed to reset node: %s from cluster %s ", nodeName, kubernetesCluster.getName()));
146146
}
147147
command = String.format("%s%s %s %s %s", scriptPath, removeNodeFromClusterScript, nodeName, "control", "delete");
148148
result = SshHelper.sshExecute(publicIp, CLUSTER_NODES_DEFAULT_START_SSH_PORT, getControlNodeLoginUser(),
149149
pkFile, null, command, 10000, 10000, 10 * 60 * 1000);
150150
if (Boolean.FALSE.equals(result.first())) {
151-
LOGGER.error(String.format("Node: %s failed to be gracefully delete node from cluster %s ", nodeName, kubernetesCluster.getName()));
151+
logger.error(String.format("Node: %s failed to be gracefully delete node from cluster %s ", nodeName, kubernetesCluster.getName()));
152152
}
153153

154154
}

‎server/src/main/java/com/cloud/network/NetworkServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6149,7 +6149,7 @@ public boolean handleCksIsoOnNetworkVirtualRouter(Long virtualRouterId, boolean
61496149
DomainRouterVO router = routerDao.findById(virtualRouterId);
61506150
if (router == null) {
61516151
String err = String.format("Cannot find VR with ID %s", virtualRouterId);
6152-
s_logger.error(err);
6152+
logger.error(err);
61536153
throw new CloudRuntimeException(err);
61546154
}
61556155
Commands commands = new Commands(Command.OnError.Stop);
@@ -6159,7 +6159,7 @@ public boolean handleCksIsoOnNetworkVirtualRouter(Long virtualRouterId, boolean
61596159
}
61606160
Answer answer = commands.getAnswer("handleCksIso");
61616161
if (answer == null || !answer.getResult()) {
6162-
s_logger.error(String.format("Could not handle the CKS ISO properly: %s", answer.getDetails()));
6162+
logger.error(String.format("Could not handle the CKS ISO properly: %s", answer.getDetails()));
61636163
return false;
61646164
}
61656165
return true;

0 commit comments

Comments
 (0)