Skip to content

Commit b8e79c3

Browse files
author
Alex Huang
committed
Compile complete
1 parent 6e8ca99 commit b8e79c3

34 files changed

Lines changed: 466 additions & 505 deletions

File tree

‎api/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
<version>${project.version}</version>
4242
<scope>test</scope>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.apache.cloudstack</groupId>
46+
<artifactId>cloud-framework-config</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
4449
</dependencies>
4550
<build>
4651
<plugins>

‎api/test/org/apache/cloudstack/test/utils/SpringUtils.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ public ComponentInstantiationPostProcessor instantiatePostProcessor() {
109109

110110
return processor;
111111
}
112+
112113
}
113114
}

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</bean>
8282

8383
<bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
84-
<bean id="configDepot" class = "org.apache.cloudstack.framework.config.ConfigDepotImpl" />
84+
<bean id="configDepot" class = "org.apache.cloudstack.framework.config.impl.ConfigDepotImpl" />
8585

8686
<!--
8787
DAO with customized configuration
@@ -718,6 +718,7 @@
718718
<bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl"/>
719719

720720
<bean id="volumeOrchestrator" class="org.apache.cloudstack.engine.orchestration.VolumeOrchestrator">
721+
<property name="PodAllocators" value="#{podAllocators.Adapters}" />
721722
<property name="StoragePoolAllocators" value="#{storagePoolAllocators.Adapters}" />
722723
</bean>
723724

@@ -726,7 +727,6 @@
726727
</bean>
727728

728729
<bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" >
729-
<property name="PodAllocators" value="#{podAllocators.Adapters}" />
730730
<property name="Discoverers" value="#{resourceDiscoverers.Adapters}" />
731731
</bean>
732732

@@ -739,7 +739,7 @@
739739
<property name="HostAllocators" value="#{hostAllocators.Adapters}" />
740740
</bean>
741741

742-
<bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" >
742+
<bean id="networkOrchestrator" class="org.apache.cloudstack.engine.orchestration.NetworkOrchestrator" >
743743
<property name="NetworkGurus" value="#{networkGurus.Adapters}" />
744744
<property name="NetworkElements" value="#{networkElements.Adapters}" />
745745
<property name="IpDeployers" value="#{ipDeployers.Adapters}" />

‎engine/components-api/src/com/cloud/agent/AgentManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ public enum TapAgentsAction {
122122

123123
Answer sendTo(Long dcId, HypervisorType type, Command cmd);
124124

125-
/* working as a lock while agent is being loaded */
126-
public boolean tapLoadingAgents(Long hostId, TapAgentsAction action);
127-
128125
// public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource, boolean forRebalance) throws ConnectionException;
129126

130127
public boolean agentStatusTransitTo(HostVO host, Status.Event e, long msId);
@@ -138,4 +135,6 @@ public enum TapAgentsAction {
138135
public void pullAgentOutMaintenance(long hostId);
139136

140137
boolean reconnect(long hostId);
138+
139+
void rescan();
141140
}

‎engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,9 @@ private ServerResource loadResourcesWithoutHypervisor(HostVO host){
654654
return resource;
655655
}
656656

657+
@Override
658+
public void rescan() {
659+
}
657660

658661
protected boolean loadDirectlyConnectedHost(HostVO host, boolean forRebalance) {
659662
boolean initialized = false;
@@ -683,7 +686,10 @@ protected boolean loadDirectlyConnectedHost(HostVO host, boolean forRebalance) {
683686
}
684687

685688
if (forRebalance) {
689+
tapLoadingAgents(host.getId(), TapAgentsAction.Add);
686690
Host h = _resourceMgr.createHostAndAgent(host.getId(), resource, host.getDetails(), false, null, true);
691+
tapLoadingAgents(host.getId(), TapAgentsAction.Del);
692+
687693
return (h == null ? false : true);
688694
} else {
689695
_executor.execute(new SimulateStartTask(host.getId(), resource, host.getDetails()));
@@ -1054,7 +1060,9 @@ public void run() {
10541060
s_logger.debug("Simulating start for resource " + resource.getName() + " id " + id);
10551061
}
10561062

1063+
tapLoadingAgents(id, TapAgentsAction.Add);
10571064
_resourceMgr.createHostAndAgent(id, resource, details, false, null, false);
1065+
tapLoadingAgents(id, TapAgentsAction.Del);
10581066
} catch (Exception e) {
10591067
s_logger.warn("Unable to simulate start on resource " + id + " name " + resource.getName(), e);
10601068
} finally {
@@ -1302,7 +1310,6 @@ protected void doTask(final Task task) throws Exception {
13021310
protected AgentManagerImpl() {
13031311
}
13041312

1305-
@Override
13061313
public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) {
13071314
synchronized (_loadingAgents) {
13081315
if (action == TapAgentsAction.Add) {

‎engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,6 +1404,19 @@ public void agentrebalance() {
14041404
profilerAgentLB.stop();
14051405
}
14061406

1407+
@Override
1408+
public void rescan() {
1409+
// schedule a scan task immediately
1410+
if (s_logger.isDebugEnabled()) {
1411+
s_logger.debug("Scheduling a host scan task");
1412+
}
1413+
// schedule host scan task on current MS
1414+
scheduleHostScanTask();
1415+
if (s_logger.isDebugEnabled()) {
1416+
s_logger.debug("Notifying all peer MS to schedule host scan task");
1417+
}
1418+
}
1419+
14071420
@Override
14081421
public ConfigKey<?>[] getConfigKeys() {
14091422
ConfigKey<?>[] keys = super.getConfigKeys();

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
3636
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager;
3737
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
38-
import org.apache.cloudstack.framework.config.ConfigurationVO;
3938
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
39+
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
4040
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4141
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
4242
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,11 @@
3838
import com.cloud.agent.api.Answer;
3939
import com.cloud.agent.api.Command;
4040
import com.cloud.agent.api.SetupCommand;
41-
import com.cloud.agent.api.StartupCommand;
42-
import com.cloud.agent.manager.AgentAttache;
4341
import com.cloud.agent.manager.Commands;
4442
import com.cloud.dc.ClusterDetailsDao;
4543
import com.cloud.dc.ClusterVO;
4644
import com.cloud.dc.dao.ClusterDao;
4745
import com.cloud.exception.AgentUnavailableException;
48-
import com.cloud.exception.ConnectionException;
4946
import com.cloud.exception.DiscoveryException;
5047
import com.cloud.exception.OperationTimedoutException;
5148
import com.cloud.host.HostEnvironment;
@@ -79,6 +76,10 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
7976
return false;
8077
}
8178

79+
@Override
80+
public void rescan() {
81+
}
82+
8283
@Override
8384
public boolean start() {
8485
// TODO Auto-generated method stub
@@ -235,19 +236,6 @@ public Answer sendTo(Long dcId, HypervisorType type, Command cmd) {
235236
return null;
236237
}
237238

238-
@Override
239-
public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) {
240-
// TODO Auto-generated method stub
241-
return false;
242-
}
243-
244-
@Override
245-
public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource,
246-
boolean forRebalance) throws ConnectionException {
247-
// TODO Auto-generated method stub
248-
return null;
249-
}
250-
251239
@Override
252240
public boolean agentStatusTransitTo(HostVO host, Event e, long msId) {
253241
try {

‎framework/config/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,5 @@
2929
<artifactId>cloud-framework-db</artifactId>
3030
<version>${project.version}</version>
3131
</dependency>
32-
<dependency>
33-
<groupId>org.apache.cloudstack</groupId>
34-
<artifactId>cloud-api</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.apache.cloudstack</groupId>
39-
<artifactId>cloud-api</artifactId>
40-
<version>${project.version}</version>
41-
<type>test-jar</type>
42-
<scope>test</scope>
43-
</dependency>
4432
</dependencies>
4533
</project>

api/src/org/apache/cloudstack/config/Configuration.java renamed to framework/config/src/org/apache/cloudstack/config/Configuration.java

File renamed without changes.

0 commit comments

Comments
 (0)