This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e3f0e3b544bdf2db0c9c832563136c8e81573cc7 Merge: 194bf6e 966b32c Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Fri Feb 4 19:04:08 2022 +0530 Merge branch '4.16' into main .../java/com/cloud/agent/api/to/IpAddressTO.java | 21 +++ .../resources/META-INF/db/schema-41600to41610.sql | 10 ++ .../apache/cloudstack/utils/linux/KVMHostInfo.java | 38 ++++- .../cloud/hypervisor/guru/VmwareVmImplementer.java | 4 +- .../hypervisor/vmware/manager/VmwareManager.java | 2 - .../vmware/manager/VmwareManagerImpl.java | 8 - .../hypervisor/vmware/resource/VmwareResource.java | 165 +++++++++------------ .../cloud/network/router/CommandSetupHelper.java | 58 ++++++++ .../router/VirtualNetworkApplianceManagerImpl.java | 2 +- .../java/com/cloud/usage/UsageServiceImpl.java | 104 +++++++------ ui/src/components/view/ListView.vue | 2 +- ui/src/config/router.js | 8 +- ui/src/views/AutogenView.vue | 4 + 13 files changed, 272 insertions(+), 154 deletions(-) diff --cc plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 297e534,d2051f6..aba5150 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@@ -7497,25 -7813,4 +7476,25 @@@ public class VmwareResource implements } return windowInterval; } -} + + @Override + public String createLogMessageException(Throwable e, Command command) { + if (e instanceof RemoteException) { + s_logger.warn("Encounter remote exception to vCenter, invalidate VMware session context."); + invalidateServiceContext(); + } + + String message = String.format("%s failed due to [%s].", command.getClass().getSimpleName(), VmwareHelper.getExceptionMessage(e)); + s_logger.error(message, e); + + return message; + } + + private void logCommand(Command cmd) { + try { + s_logger.debug(String.format(EXECUTING_RESOURCE_COMMAND, cmd.getClass().getSimpleName(), _gson.toJson(cmd))); + } catch (Exception e) { + s_logger.error(String.format("Failed to log command %s due to: [%s].", cmd.getClass().getSimpleName(), e.getMessage()), e); + } + } - } ++}
