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

Fix: allow executing CopyCommand operations in parallel when it is set (#5960)

Browse Source 
* Invoke the hypervisor guru instead of the guru cycle

* Refactor

* Remove unused import

* Refactor error
This commit is contained in:
Nicolas Vazquez 2022-02-14 23:52:45 -03:00 committed by GitHub
parent fe03e306ac
commit 97d42e9980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/components-api/src/main/java/com/cloud/hypervisor/HypervisorGuruManager.java
View File

@ -24,4 +24,6 @@ public interface HypervisorGuruManager extends Manager {
HypervisorGuru getGuru(HypervisorType hypervisorType); HypervisorGuru getGuru(HypervisorType hypervisorType);
long getGuruProcessedCommandTargetHost(long hostId, Command cmd); long getGuruProcessedCommandTargetHost(long hostId, Command cmd);
long getGuruProcessedCommandTargetHost(long hostId, Command cmd, HypervisorType hypervisorType);
} }

9
engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -342,10 +342,15 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} }
Answer answer = null; Answer answer = null;
try { try {
final long targetHostId = _hvGuruMgr.getGuruProcessedCommandTargetHost(host.getId(), cmd, host.getHypervisorType());
final long targetHostId = _hvGuruMgr.getGuruProcessedCommandTargetHost(host.getId(), cmd);
answer = easySend(targetHostId, cmd); answer = easySend(targetHostId, cmd);
} catch (final Exception e) { } catch (final Exception e) {
String errorMsg = String.format("Error sending command %s to host %s, due to %s", cmd.getClass().getName(),
host.getUuid(), e.getLocalizedMessage());
s_logger.error(errorMsg);
if (s_logger.isDebugEnabled()) {
s_logger.debug(errorMsg, e);
}
} }
if (answer != null) { if (answer != null) {
return answer; return answer;

7
server/src/main/java/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
View File

@ -81,6 +81,13 @@ public class HypervisorGuruManagerImpl extends ManagerBase implements Hypervisor
return hostId; return hostId;
} }
@Override
public long getGuruProcessedCommandTargetHost(long hostId, Command cmd, HypervisorType hypervisorType) {
HypervisorGuru guru = getGuru(hypervisorType);
Pair<Boolean, Long> result = guru.getCommandHostDelegation(hostId, cmd);
return result.first() ? result.second() : hostId;
}
public List<HypervisorGuru> getHvGuruList() { public List<HypervisorGuru> getHvGuruList() {
return _hvGuruList; return _hvGuruList;
} }