apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: fix mgmt server 503 error by renaming kubernetesClusterHelper to kubernetesServiceHelper

Browse Source
This commit is contained in:
Wei Zhou 2024-06-15 08:35:36 +02:00
parent 3a5c4a0cba
commit aab1361949
No known key found for this signature in database
GPG Key ID: 1503DFE7C8226103
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -611,7 +611,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
private boolean _dailyOrHourly = false; private boolean _dailyOrHourly = false;
private int capacityReleaseInterval; private int capacityReleaseInterval;
private ExecutorService _vmIpFetchThreadExecutor; private ExecutorService _vmIpFetchThreadExecutor;
private List<KubernetesServiceHelper> kubernetesClusterHelpers; private List<KubernetesServiceHelper> kubernetesServiceHelpers;
private String _instance; private String _instance;
@ -625,12 +625,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
private static final int NUM_OF_2K_BLOCKS = 512; private static final int NUM_OF_2K_BLOCKS = 512;
private static final int MAX_HTTP_POST_LENGTH = NUM_OF_2K_BLOCKS * MAX_USER_DATA_LENGTH_BYTES; private static final int MAX_HTTP_POST_LENGTH = NUM_OF_2K_BLOCKS * MAX_USER_DATA_LENGTH_BYTES;
public List<KubernetesServiceHelper> getKubernetesClusterHelpers() { public List<KubernetesServiceHelper> getKubernetesServiceHelpers() {
return kubernetesClusterHelpers; return kubernetesServiceHelpers;
} }
public void setKubernetesClusterHelpers(final List<KubernetesServiceHelper> kubernetesClusterHelpers) { public void setKubernetesServiceHelpers(final List<KubernetesServiceHelper> kubernetesServiceHelpers) {
this.kubernetesClusterHelpers = kubernetesClusterHelpers; this.kubernetesServiceHelpers = kubernetesServiceHelpers;
} }
@Inject @Inject
@ -2564,7 +2564,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
// cleanup port forwarding rules // cleanup port forwarding rules
VMInstanceVO vmInstanceVO = _vmInstanceDao.findById(vmId); VMInstanceVO vmInstanceVO = _vmInstanceDao.findById(vmId);
NsxProviderVO nsx = nsxProviderDao.findByZoneId(vmInstanceVO.getDataCenterId()); NsxProviderVO nsx = nsxProviderDao.findByZoneId(vmInstanceVO.getDataCenterId());
if (Objects.isNull(nsx) || Objects.isNull(kubernetesClusterHelpers.get(0).findByVmId(vmId))) { if (Objects.isNull(nsx) || Objects.isNull(kubernetesServiceHelpers.get(0).findByVmId(vmId))) {
if (_rulesMgr.revokePortForwardingRulesForVm(vmId)) { if (_rulesMgr.revokePortForwardingRulesForVm(vmId)) {
logger.debug("Port forwarding rules are removed successfully as a part of vm id=" + vmId + " expunge"); logger.debug("Port forwarding rules are removed successfully as a part of vm id=" + vmId + " expunge");
} else { } else {

2
server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
View File

@ -107,7 +107,7 @@
<bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" /> <bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" />
<bean id="userVmManagerImpl" class="com.cloud.vm.UserVmManagerImpl"> <bean id="userVmManagerImpl" class="com.cloud.vm.UserVmManagerImpl">
<property name="kubernetesClusterHelpers" value="#{kubernetesClusterHelperRegistry.registered}" /> <property name="kubernetesServiceHelpers" value="#{kubernetesServiceHelperRegistry.registered}" />
</bean> </bean>
<bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl"> <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl">