Skip to content

Commit 86f2b79

Browse files
davidjumanidavidjumani
authored
CKS : More log changes from uuid to name (#4415)
1 parent 1a75872 commit 86f2b79

9 files changed

Lines changed: 212 additions & 204 deletions

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

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private UserVm fetchMasterVmIfMissing(final UserVm masterVm) {
237237
}
238238
List<KubernetesClusterVmMapVO> clusterVMs = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
239239
if (CollectionUtils.isEmpty(clusterVMs)) {
240-
LOGGER.warn(String.format("Unable to retrieve VMs for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
240+
LOGGER.warn(String.format("Unable to retrieve VMs for Kubernetes cluster : %s", kubernetesCluster.getName()));
241241
return null;
242242
}
243243
List<Long> vmIds = new ArrayList<>();
@@ -265,32 +265,32 @@ protected Pair<String, Integer> getKubernetesClusterServerIpSshPort(UserVm maste
265265
}
266266
Network network = networkDao.findById(kubernetesCluster.getNetworkId());
267267
if (network == null) {
268-
LOGGER.warn(String.format("Network for Kubernetes cluster ID: %s cannot be found", kubernetesCluster.getUuid()));
268+
LOGGER.warn(String.format("Network for Kubernetes cluster : %s cannot be found", kubernetesCluster.getName()));
269269
return new Pair<>(null, port);
270270
}
271271
if (Network.GuestType.Isolated.equals(network.getGuestType())) {
272272
List<? extends IpAddress> addresses = networkModel.listPublicIpsAssignedToGuestNtwk(network.getId(), true);
273273
if (CollectionUtils.isEmpty(addresses)) {
274-
LOGGER.warn(String.format("No public IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
274+
LOGGER.warn(String.format("No public IP addresses found for network : %s, Kubernetes cluster : %s", network.getName(), kubernetesCluster.getName()));
275275
return new Pair<>(null, port);
276276
}
277277
for (IpAddress address : addresses) {
278278
if (address.isSourceNat()) {
279279
return new Pair<>(address.getAddress().addr(), port);
280280
}
281281
}
282-
LOGGER.warn(String.format("No source NAT IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
282+
LOGGER.warn(String.format("No source NAT IP addresses found for network : %s, Kubernetes cluster : %s", network.getName(), kubernetesCluster.getName()));
283283
return new Pair<>(null, port);
284284
} else if (Network.GuestType.Shared.equals(network.getGuestType())) {
285285
port = 22;
286286
masterVm = fetchMasterVmIfMissing(masterVm);
287287
if (masterVm == null) {
288-
LOGGER.warn(String.format("Unable to retrieve master VM for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
288+
LOGGER.warn(String.format("Unable to retrieve master VM for Kubernetes cluster : %s", kubernetesCluster.getName()));
289289
return new Pair<>(null, port);
290290
}
291291
return new Pair<>(masterVm.getPrivateIpAddress(), port);
292292
}
293-
LOGGER.warn(String.format("Unable to retrieve server IP address for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
293+
LOGGER.warn(String.format("Unable to retrieve server IP address for Kubernetes cluster : %s", kubernetesCluster.getName()));
294294
return new Pair<>(null, port);
295295
}
296296

@@ -305,26 +305,26 @@ protected void attachIsoKubernetesVMs(List<UserVm> clusterVMs, final KubernetesS
305305
failedEvent = KubernetesCluster.Event.CreateFailed;
306306
}
307307
if (version == null) {
308-
logTransitStateAndThrow(Level.ERROR, String .format("Unable to find Kubernetes version for cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
308+
logTransitStateAndThrow(Level.ERROR, String .format("Unable to find Kubernetes version for cluster : %s", kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent);
309309
}
310310
VMTemplateVO iso = templateDao.findById(version.getIsoId());
311311
if (iso == null) {
312-
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Binaries ISO not found.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
312+
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster : %s. Binaries ISO not found.", kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent);
313313
}
314314
if (!iso.getFormat().equals(Storage.ImageFormat.ISO)) {
315-
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Invalid Binaries ISO.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
315+
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster : %s. Invalid Binaries ISO.", kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent);
316316
}
317317
if (!iso.getState().equals(VirtualMachineTemplate.State.Active)) {
318-
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Binaries ISO not active.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
318+
logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster : %s. Binaries ISO not active.", kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent);
319319
}
320320
for (UserVm vm : clusterVMs) {
321321
try {
322322
templateService.attachIso(iso.getId(), vm.getId());
323323
if (LOGGER.isInfoEnabled()) {
324-
LOGGER.info(String.format("Attached binaries ISO for VM: %s in cluster: %s", vm.getUuid(), kubernetesCluster.getName()));
324+
LOGGER.info(String.format("Attached binaries ISO for VM : %s in cluster: %s", vm.getDisplayName(), kubernetesCluster.getName()));
325325
}
326326
} catch (CloudRuntimeException ex) {
327-
logTransitStateAndThrow(Level.ERROR, String.format("Failed to attach binaries ISO for VM: %s in the Kubernetes cluster name: %s", vm.getDisplayName(), kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent, ex);
327+
logTransitStateAndThrow(Level.ERROR, String.format("Failed to attach binaries ISO for VM : %s in the Kubernetes cluster name: %s", vm.getDisplayName(), kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent, ex);
328328
}
329329
}
330330
}
@@ -339,15 +339,15 @@ protected void detachIsoKubernetesVMs(List<UserVm> clusterVMs) {
339339
try {
340340
result = templateService.detachIso(vm.getId());
341341
} catch (CloudRuntimeException ex) {
342-
LOGGER.warn(String.format("Failed to detach binaries ISO from VM ID: %s in the Kubernetes cluster ID: %s ", vm.getUuid(), kubernetesCluster.getUuid()), ex);
342+
LOGGER.warn(String.format("Failed to detach binaries ISO from VM : %s in the Kubernetes cluster : %s ", vm.getDisplayName(), kubernetesCluster.getName()), ex);
343343
}
344344
if (result) {
345345
if (LOGGER.isInfoEnabled()) {
346-
LOGGER.info(String.format("Detached Kubernetes binaries from VM ID: %s in the Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()));
346+
LOGGER.info(String.format("Detached Kubernetes binaries from VM : %s in the Kubernetes cluster : %s", vm.getDisplayName(), kubernetesCluster.getName()));
347347
}
348348
continue;
349349
}
350-
LOGGER.warn(String.format("Failed to detach binaries ISO from VM ID: %s in the Kubernetes cluster ID: %s ", vm.getUuid(), kubernetesCluster.getUuid()));
350+
LOGGER.warn(String.format("Failed to detach binaries ISO from VM : %s in the Kubernetes cluster : %s ", vm.getDisplayName(), kubernetesCluster.getName()));
351351
}
352352
}
353353

@@ -375,7 +375,8 @@ protected boolean stateTransitTo(long kubernetesClusterId, KubernetesCluster.Eve
375375
try {
376376
return _stateMachine.transitTo(kubernetesCluster, e, null, kubernetesClusterDao);
377377
} catch (NoTransitionException nte) {
378-
LOGGER.warn(String.format("Failed to transition state of the Kubernetes cluster ID: %s in state %s on event %s", kubernetesCluster.getUuid(), kubernetesCluster.getState().toString(), e.toString()), nte);
378+
LOGGER.warn(String.format("Failed to transition state of the Kubernetes cluster : %s in state %s on event %s",
379+
kubernetesCluster.getName(), kubernetesCluster.getState().toString(), e.toString()), nte);
379380
return false;
380381
}
381382
}

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ private void validateClusterSate() {
6767
|| kubernetesCluster.getState().equals(KubernetesCluster.State.Alert)
6868
|| kubernetesCluster.getState().equals(KubernetesCluster.State.Error)
6969
|| kubernetesCluster.getState().equals(KubernetesCluster.State.Destroying))) {
70-
String msg = String.format("Cannot perform delete operation on cluster ID: %s in state: %s",kubernetesCluster.getUuid(), kubernetesCluster.getState());
70+
String msg = String.format("Cannot perform delete operation on cluster : %s in state: %s",
71+
kubernetesCluster.getName(), kubernetesCluster.getState());
7172
LOGGER.warn(msg);
7273
throw new PermissionDeniedException(msg);
7374
}
@@ -87,16 +88,15 @@ private boolean destroyClusterVMs() {
8788
try {
8889
UserVm vm = userVmService.destroyVm(vmID, true);
8990
if (!userVmManager.expunge(userVM, CallContext.current().getCallingUserId(), CallContext.current().getCallingAccount())) {
90-
LOGGER.warn(String.format("Unable to expunge VM '%s' ID: %s, destroying Kubernetes cluster will probably fail"
91-
, vm.getInstanceName()
92-
, vm.getUuid()));
91+
LOGGER.warn(String.format("Unable to expunge VM %s : %s, destroying Kubernetes cluster will probably fail",
92+
vm.getInstanceName() , vm.getUuid()));
9393
}
9494
kubernetesClusterVmMapDao.expunge(clusterVM.getId());
9595
if (LOGGER.isInfoEnabled()) {
96-
LOGGER.info(String.format("Destroyed VM ID: %s as part of Kubernetes cluster ID: %s cleanup", vm.getUuid(), kubernetesCluster.getUuid()));
96+
LOGGER.info(String.format("Destroyed VM : %s as part of Kubernetes cluster : %s cleanup", vm.getDisplayName(), kubernetesCluster.getName()));
9797
}
9898
} catch (ResourceUnavailableException | ConcurrentOperationException e) {
99-
LOGGER.warn(String.format("Failed to destroy VM ID: %s part of the Kubernetes cluster ID: %s cleanup. Moving on with destroying remaining resources provisioned for the Kubernetes cluster", userVM.getUuid(), kubernetesCluster.getUuid()), e);
99+
LOGGER.warn(String.format("Failed to destroy VM : %s part of the Kubernetes cluster : %s cleanup. Moving on with destroying remaining resources provisioned for the Kubernetes cluster", userVM.getDisplayName(), kubernetesCluster.getName()), e);
100100
return false;
101101
}
102102
}
@@ -118,12 +118,13 @@ private void destroyKubernetesClusterNetwork() throws ManagementServerException
118118
ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner);
119119
boolean networkDestroyed = networkMgr.destroyNetwork(kubernetesCluster.getNetworkId(), context, true);
120120
if (!networkDestroyed) {
121-
String msg = String.format("Failed to destroy network ID: %s as part of Kubernetes cluster ID: %s cleanup", network.getUuid(), kubernetesCluster.getUuid());
121+
String msg = String.format("Failed to destroy network : %s as part of Kubernetes cluster : %s cleanup", network.getName(), kubernetesCluster.getName());
122122
LOGGER.warn(msg);
123123
throw new ManagementServerException(msg);
124124
}
125125
if (LOGGER.isInfoEnabled()) {
126-
LOGGER.info(String.format("Destroyed network: %s as part of Kubernetes cluster ID: %s cleanup", network.getUuid(), kubernetesCluster.getUuid()));
126+
LOGGER.info(String.format("Destroyed network : %s as part of Kubernetes cluster : %s cleanup",
127+
network.getName(), kubernetesCluster.getName()));
127128
}
128129
}
129130
}
@@ -141,12 +142,12 @@ private void deleteKubernetesClusterNetworkRules() throws ManagementServerExcept
141142
}
142143
IpAddress publicIp = getSourceNatIp(network);
143144
if (publicIp == null) {
144-
throw new ManagementServerException(String.format("No source NAT IP addresses found for network ID: %s", network.getUuid()));
145+
throw new ManagementServerException(String.format("No source NAT IP addresses found for network : %s", network.getName()));
145146
}
146147
try {
147148
removeLoadBalancingRule(publicIp, network, owner, CLUSTER_API_PORT);
148149
} catch (ResourceUnavailableException e) {
149-
throw new ManagementServerException(String.format("Failed to KubernetesCluster load balancing rule for network ID: %s", network.getUuid()));
150+
throw new ManagementServerException(String.format("Failed to KubernetesCluster load balancing rule for network : %s", network.getName()));
150151
}
151152
FirewallRule firewallRule = removeApiFirewallRule(publicIp);
152153
if (firewallRule == null) {
@@ -159,7 +160,7 @@ private void deleteKubernetesClusterNetworkRules() throws ManagementServerExcept
159160
try {
160161
removePortForwardingRules(publicIp, network, owner, removedVmIds);
161162
} catch (ResourceUnavailableException e) {
162-
throw new ManagementServerException(String.format("Failed to KubernetesCluster port forwarding rules for network ID: %s", network.getUuid()));
163+
throw new ManagementServerException(String.format("Failed to KubernetesCluster port forwarding rules for network : %s", network.getName()));
163164
}
164165
}
165166

@@ -201,7 +202,7 @@ public boolean destroy() throws CloudRuntimeException {
201202
if (network != null) {
202203
List<VMInstanceVO> networkVMs = vmInstanceDao.listNonRemovedVmsByTypeAndNetwork(network.getId(), VirtualMachine.Type.User);
203204
if (networkVMs.size() > clusterVMs.size()) {
204-
logAndThrow(Level.ERROR, String.format("Network ID: %s for Kubernetes cluster ID: %s has instances using it which are not part of the Kubernetes cluster", network.getUuid(), kubernetesCluster.getUuid()));
205+
logAndThrow(Level.ERROR, String.format("Network : %s for Kubernetes cluster : %s has instances using it which are not part of the Kubernetes cluster", network.getName(), kubernetesCluster.getName()));
205206
}
206207
for (VMInstanceVO vm : networkVMs) {
207208
boolean vmFoundInKubernetesCluster = false;
@@ -212,15 +213,15 @@ public boolean destroy() throws CloudRuntimeException {
212213
}
213214
}
214215
if (!vmFoundInKubernetesCluster) {
215-
logAndThrow(Level.ERROR, String.format("VM ID: %s which is not a part of Kubernetes cluster ID: %s is using Kubernetes cluster network ID: %s", vm.getUuid(), kubernetesCluster.getUuid(), network.getUuid()));
216+
logAndThrow(Level.ERROR, String.format("VM : %s which is not a part of Kubernetes cluster : %s is using Kubernetes cluster network : %s", vm.getUuid(), kubernetesCluster.getName(), network.getName()));
216217
}
217218
}
218219
} else {
219-
LOGGER.error(String.format("Failed to find network for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
220+
LOGGER.error(String.format("Failed to find network for Kubernetes cluster : %s", kubernetesCluster.getName()));
220221
}
221222
}
222223
if (LOGGER.isInfoEnabled()) {
223-
LOGGER.info(String.format("Destroying Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
224+
LOGGER.info(String.format("Destroying Kubernetes cluster : %s", kubernetesCluster.getName()));
224225
}
225226
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.DestroyRequested);
226227
boolean vmsDestroyed = destroyClusterVMs();
@@ -231,7 +232,7 @@ public boolean destroy() throws CloudRuntimeException {
231232
try {
232233
destroyKubernetesClusterNetwork();
233234
} catch (ManagementServerException e) {
234-
String msg = String.format("Failed to destroy network of Kubernetes cluster ID: %s cleanup", kubernetesCluster.getUuid());
235+
String msg = String.format("Failed to destroy network of Kubernetes cluster : %s cleanup", kubernetesCluster.getName());
235236
LOGGER.warn(msg, e);
236237
updateKubernetesClusterEntryForGC();
237238
throw new CloudRuntimeException(msg, e);
@@ -240,27 +241,27 @@ public boolean destroy() throws CloudRuntimeException {
240241
try {
241242
deleteKubernetesClusterNetworkRules();
242243
} catch (ManagementServerException e) {
243-
String msg = String.format("Failed to remove network rules of Kubernetes cluster ID: %s", kubernetesCluster.getUuid());
244+
String msg = String.format("Failed to remove network rules of Kubernetes cluster : %s", kubernetesCluster.getName());
244245
LOGGER.warn(msg, e);
245246
updateKubernetesClusterEntryForGC();
246247
throw new CloudRuntimeException(msg, e);
247248
}
248249
}
249250
} else {
250-
String msg = String.format("Failed to destroy one or more VMs as part of Kubernetes cluster ID: %s cleanup", kubernetesCluster.getUuid());
251+
String msg = String.format("Failed to destroy one or more VMs as part of Kubernetes cluster : %s cleanup", kubernetesCluster.getName());
251252
LOGGER.warn(msg);
252253
updateKubernetesClusterEntryForGC();
253254
throw new CloudRuntimeException(msg);
254255
}
255256
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
256257
boolean deleted = kubernetesClusterDao.remove(kubernetesCluster.getId());
257258
if (!deleted) {
258-
logMessage(Level.WARN, String.format("Failed to delete Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), null);
259+
logMessage(Level.WARN, String.format("Failed to delete Kubernetes cluster : %s", kubernetesCluster.getName()), null);
259260
updateKubernetesClusterEntryForGC();
260261
return false;
261262
}
262263
if (LOGGER.isInfoEnabled()) {
263-
LOGGER.info(String.format("Kubernetes cluster ID: %s is successfully deleted", kubernetesCluster.getUuid()));
264+
LOGGER.info(String.format("Kubernetes cluster : %s is successfully deleted", kubernetesCluster.getName()));
264265
}
265266
return true;
266267
}

0 commit comments

Comments
 (0)