Skip to content

Commit 2c5859d

Browse files
kelvenykelveny
committed
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
1 parent d056cd5 commit 2c5859d

29 files changed

Lines changed: 59 additions & 239 deletions

‎client/tomcatconf/componentContext.xml.in‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,24 @@
3232

3333

3434
<!--
35-
Configurable components
35+
Compose a CloudStack deployment with selected components here
3636
-->
37+
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
38+
3739
<bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" />
3840
<bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" />
3941

42+
<bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
43+
<bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" />
44+
<bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" />
45+
<bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" />
46+
<bean id="bareMetalVmManagerImpl" class="com.cloud.baremetal.BareMetalVmManagerImpl" />
47+
<bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl" />
48+
<bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" />
49+
<bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" />
50+
<bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" />
51+
52+
4053
<!--
4154
Network Elements
4255
-->

‎engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ public List<DataStoreProvider> getDataStoreProviders() {
5656

5757
@Override
5858
public boolean configure(String name, Map<String, Object> params)
59-
throws ConfigurationException {
60-
//TODO: hold global lock
59+
throws ConfigurationException {
60+
61+
/*
62+
//TODO: hold global lock
6163
List<DataStoreProviderVO> providerVos = providerDao.listAll();
6264
for (DataStoreProvider provider : providers) {
6365
boolean existingProvider = false;
@@ -82,6 +84,7 @@ public boolean configure(String name, Map<String, Object> params)
8284
provider.configure(params);
8385
providerMap.put(uuid, provider);
8486
}
87+
*/
8588
return true;
8689
}
8790

‎server/src/com/cloud/agent/manager/AgentManagerImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
* ping.interval before announcing an agent has timed out | float | 2.0x || || router.stats.interval | interval to
141141
* report router statistics | seconds | 300s || * }
142142
**/
143-
@Component
144143
@Local(value = { AgentManager.class })
145144
public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
146145
private static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class);

‎server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
import com.cloud.utils.nio.Link;
8989
import com.cloud.utils.nio.Task;
9090

91-
@Component
92-
@Primary
9391
@Local(value = { AgentManager.class, ClusteredAgentRebalanceService.class })
9492
public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService {
9593
final static Logger s_logger = Logger.getLogger(ClusteredAgentManagerImpl.class);
@@ -117,8 +115,6 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
117115
// @com.cloud.utils.component.Inject(adapter = AgentLoadBalancerPlanner.class)
118116
@Inject protected List<AgentLoadBalancerPlanner> _lbPlanners;
119117

120-
@Inject
121-
protected AgentManager _agentMgr;
122118
@Inject ConfigurationDao _configDao;
123119

124120
protected ClusteredAgentManagerImpl() {

‎server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@
105105
import com.cloud.vm.VirtualMachineProfile;
106106
import com.cloud.vm.VirtualMachineProfile.Param;
107107

108-
@Component
109-
@Primary
110108
@Local(value={BareMetalVmManager.class, BareMetalVmService.class})
111109
public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMetalVmManager, BareMetalVmService, Manager,
112110
StateListener<State, VirtualMachine.Event, VirtualMachine> {

‎server/src/com/cloud/cluster/ClusterManagerImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
import com.cloud.utils.net.NetUtils;
8989
import com.google.gson.Gson;
9090

91-
@Component
92-
@Primary
9391
@Local(value = { ClusterManager.class })
9492
public class ClusterManagerImpl implements ClusterManager {
9593
private static final Logger s_logger = Logger.getLogger(ClusterManagerImpl.class);

‎server/src/com/cloud/cluster/DummyClusterManagerImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.cloud.utils.exception.CloudRuntimeException;
3333
import com.cloud.utils.net.MacAddress;
3434

35-
@Component
3635
@Local(value={ClusterManager.class})
3736
public class DummyClusterManagerImpl implements ClusterManager {
3837
private static final Logger s_logger = Logger.getLogger(DummyClusterManagerImpl.class);

‎server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import com.cloud.vm.dao.UserVmDao;
6363
import com.cloud.vm.dao.VMInstanceDao;
6464

65-
@Component
6665
@Local(value = { ConsoleProxyManager.class })
6766
public class AgentBasedConsoleProxyManager implements ConsoleProxyManager, VirtualMachineGuru<ConsoleProxyVO>, AgentHook {
6867
private static final Logger s_logger = Logger.getLogger(AgentBasedConsoleProxyManager.class);

‎server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.cloud.info.ConsoleProxyInfo;
2929
import com.cloud.vm.UserVmVO;
3030

31-
@Component
3231
@Local(value={ConsoleProxyManager.class})
3332
public class AgentBasedStandaloneConsoleProxyManager extends
3433
AgentBasedConsoleProxyManager {

‎server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@
170170
// Starting, HA, Migrating, Running state are all counted as "Open" for available capacity calculation
171171
// because sooner or later, it will be driven into Running state
172172
//
173-
@Component
174-
@Primary
175173
@Local(value = { ConsoleProxyManager.class, ConsoleProxyService.class })
176174
public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProxyService, Manager, AgentHook, VirtualMachineGuru<ConsoleProxyVO>, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
177175
private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class);

0 commit comments

Comments
 (0)