Skip to content

Commit 0c61531

Browse files
DaanHooglandJoaoJandrewinterhazel
authored
log messages (#9093)
* log messages * Apply suggestions from code review Co-authored-by: João Jandre <48719461+JoaoJandre@users.noreply.github.com> * Update plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com> --------- Co-authored-by: João Jandre <48719461+JoaoJandre@users.noreply.github.com> Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
1 parent 19f9635 commit 0c61531

5 files changed

Lines changed: 6 additions & 12 deletions

File tree

plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ private String createVMAndFolderWithVMName(VmwareContext context, VmwareHypervis
948948
dsMo.moveDatastoreFile(vmwareLayoutFilePair[i], dcMo.getMor(), dsMo.getMor(), legacyCloudStackLayoutFilePair[i], dcMo.getMor(), true);
949949
}
950950

951-
logger.info("detach disks from volume-wrapper VM and destroy" + vmdkName);
951+
logger.info("detach disks from volume-wrapper VM and destroy {}", vmdkName);
952952
vmMo.detachAllDisksAndDestroy();
953953

954954
String srcFile = dsMo.getDatastorePath(vmdkName, true);

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,7 @@ private DeployDestination plan(final long nodesCount, final DataCenter zone, fin
515515
logger.debug(String.format("Checking host ID: %s for capacity already reserved %d", hostVO.getUuid(), reserved));
516516
}
517517
if (capacityManager.checkIfHostHasCapacity(hostVO.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
518-
if (logger.isDebugEnabled()) {
519-
logger.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%s", hostVO.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved)));
520-
}
518+
logger.debug("Found host ID == '{}' to have enough capacity, CPU={} RAM={}", hostVO.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved));
521519
hostEntry.setValue(new Pair<HostVO, Integer>(hostVO, reserved));
522520
suitable_host_found = true;
523521
planCluster = cluster;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f
263263
logger.debug(String.format("Checking host : %s for capacity already reserved %d", h.getName(), reserved));
264264
}
265265
if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
266-
if (logger.isDebugEnabled()) {
267-
logger.debug(String.format("Found host : %s for with enough capacity, CPU=%d RAM=%s", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved)));
268-
}
266+
logger.debug("Found host {} with enough capacity: CPU={} RAM={}", h.getName(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved));
269267
hostEntry.setValue(new Pair<HostVO, Integer>(h, reserved));
270268
suitable_host_found = true;
271269
break;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public boolean startKubernetesClusterOnCreate() {
533533
}
534534
attachIsoKubernetesVMs(clusterVMs);
535535
if (!KubernetesClusterUtil.isKubernetesClusterControlVmRunning(kubernetesCluster, publicIpAddress, publicIpSshPort.second(), startTimeoutTime)) {
536-
String msg = String.format("Failed to setup Kubernetes cluster : %s in usable state as unable to access control node VMs of the cluster", kubernetesCluster.getName());
536+
String msg = String.format("Failed to setup Kubernetes cluster : %s is not in usable state as the system is unable to access control node VMs of the cluster", kubernetesCluster.getName());
537537
if (kubernetesCluster.getControlNodeCount() > 1 && Network.GuestType.Shared.equals(network.getGuestType())) {
538538
msg = String.format("%s. Make sure external load-balancer has port forwarding rules for SSH access on ports %d-%d and API access on port %d",
539539
msg,

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,11 @@ public static boolean isKubernetesClusterControlVmRunning(final KubernetesCluste
266266
socket.connect(new InetSocketAddress(ipAddress, port), 10000);
267267
controlVmRunning = true;
268268
} catch (IOException e) {
269-
if (LOGGER.isInfoEnabled()) {
270-
LOGGER.info(String.format("Waiting for Kubernetes cluster : %s control node VMs to be accessible", kubernetesCluster.getName()));
271-
}
269+
LOGGER.info("Waiting for Kubernetes cluster : {} control node VMs to be accessible", kubernetesCluster.getName());
272270
try {
273271
Thread.sleep(10000);
274272
} catch (InterruptedException ex) {
275-
LOGGER.warn(String.format("Error while waiting for Kubernetes cluster : %s control node VMs to be accessible", kubernetesCluster.getName()), ex);
273+
LOGGER.warn("Error while waiting for Kubernetes cluster : {} control node VMs to be accessible", kubernetesCluster.getName(), ex);
276274
}
277275
}
278276
}

0 commit comments

Comments
 (0)