Skip to content

Commit cf3bbb1

Browse files
author
Alex Huang
committed
Switched AgentManager to use ConfigDepot
1 parent 30c3341 commit cf3bbb1

7 files changed

Lines changed: 9 additions & 180 deletions

File tree

‎engine/compute/pom.xml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎engine/compute/src/org/apache/cloudstack/compute/ComputeOrchestrator.java‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎engine/compute/src/org/apache/cloudstack/compute/ComputeOrchestratorImpl.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎engine/planning/src/org/apache/cloudstack/platform/planning/Concierge.java‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎engine/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
</build>
3333
<modules>
3434
<module>api</module>
35-
<module>compute</module>
3635
<module>orchestration</module>
3736
<module>storage</module>
3837
<module>storage/volume</module>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
import com.cloud.resource.ResourceState;
9898
import com.cloud.resource.ServerResource;
9999
import com.cloud.storage.resource.DummySecondaryStorageResource;
100-
import com.cloud.utils.NumbersUtil;
101100
import com.cloud.utils.Pair;
102101
import com.cloud.utils.component.ManagerBase;
103102
import com.cloud.utils.concurrency.NamedThreadFactory;
@@ -148,7 +147,6 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
148147
protected ConfigurationDao _configDao = null;
149148
@Inject
150149
protected ClusterDao _clusterDao = null;
151-
protected int _port;
152150

153151
@Inject
154152
protected HighAvailabilityManager _haMgr = null;
@@ -194,12 +192,13 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
194192
protected final ConfigKey<Integer> DirectAgentPoolSize = new ConfigKey<Integer>(Integer.class, "direct.agent.pool.size", "Advance", AgentManager.class, "500",
195193
"Default size for DirectAgentPool", false, null);
196194

195+
protected ConfigValue<Integer> _port;
196+
197197
@Override
198198
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
199199

200-
final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
201-
_port = NumbersUtil.parseInt(configs.get("port"), 8250);
202-
final int workers = NumbersUtil.parseInt(configs.get("workers"), 5);
200+
_port = _configDepot.get(Port);
201+
ConfigValue<Integer> workers = _configDepot.get(Workers);
203202

204203
_pingInterval = _configDepot.get(PingInterval);
205204

@@ -225,8 +224,8 @@ public boolean configure(final String name, final Map<String, Object> params) th
225224
//allow core threads to time out even when there are no items in the queue
226225
_connectExecutor.allowCoreThreadTimeOut(true);
227226

228-
_connection = new NioServer("AgentManager", _port, workers + 10, this);
229-
s_logger.info("Listening on " + _port + " with " + workers + " workers");
227+
_connection = new NioServer("AgentManager", _port.value(), workers.value() + 10, this);
228+
s_logger.info("Listening on " + _port.value() + " with " + workers.value() + " workers");
230229

231230

232231
ConfigValue<Integer> size = _configDepot.get(DirectAgentPoolSize);

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
import com.cloud.host.HostVO;
8484
import com.cloud.host.Status;
8585
import com.cloud.host.Status.Event;
86-
import com.cloud.resource.ResourceState;
8786
import com.cloud.resource.ServerResource;
8887
import com.cloud.serializer.GsonHelper;
8988
import com.cloud.storage.resource.DummySecondaryStorageResource;
@@ -508,13 +507,13 @@ public SocketChannel connectToPeer(String peerName, SocketChannel prevCh) {
508507
throw new CloudRuntimeException("Unable to resolve " + ip);
509508
}
510509
try {
511-
ch = SocketChannel.open(new InetSocketAddress(addr, _port));
510+
ch = SocketChannel.open(new InetSocketAddress(addr, _port.value()));
512511
ch.configureBlocking(true); // make sure we are working at blocking mode
513512
ch.socket().setKeepAlive(true);
514513
ch.socket().setSoTimeout(60 * 1000);
515514
try {
516515
SSLContext sslContext = Link.initSSLContext(true);
517-
sslEngine = sslContext.createSSLEngine(ip, _port);
516+
sslEngine = sslContext.createSSLEngine(ip, _port.value());
518517
sslEngine.setUseClientMode(true);
519518

520519
Link.doHandshake(ch, sslEngine, true);
@@ -1241,10 +1240,6 @@ public Answer[] sendToAgent(Long hostId, Command[] cmds, boolean stopOnError) th
12411240
}
12421241

12431242

1244-
public boolean executeResourceUserRequest(long hostId, ResourceState.Event event) throws AgentUnavailableException {
1245-
return _resourceMgr.executeUserRequest(hostId, event);
1246-
}
1247-
12481243
protected class ClusterDispatcher implements ClusterManager.Dispatcher {
12491244
@Override
12501245
public String getName() {
@@ -1317,7 +1312,7 @@ public String dispatch(ClusterServicePdu pdu) {
13171312

13181313
boolean result = false;
13191314
try {
1320-
result = executeResourceUserRequest(cmd.getHostId(), cmd.getEvent());
1315+
result = _resourceMgr.executeUserRequest(cmd.getHostId(), cmd.getEvent());
13211316
s_logger.debug("Result is " + result);
13221317
} catch (AgentUnavailableException ex) {
13231318
s_logger.warn("Agent is unavailable", ex);

0 commit comments

Comments
 (0)