Moti Asayag has uploaded a new change for review.
Change subject: engine: Avoid static access to ResourceManager from VdsManager
......................................................................
engine: Avoid static access to ResourceManager from VdsManager
Change-Id: I945f3ff94bf8022d4efc13bcec289edd85755749
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
2 files changed, 22 insertions(+), 28 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/40935/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
index 942e8ca..6075a5d 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
@@ -227,7 +227,7 @@
}
public void AddVds(VDS vds, boolean isInternal) {
- VdsManager vdsManager = new VdsManager(vds, auditLogDirector);
+ VdsManager vdsManager = new VdsManager(vds, auditLogDirector, this);
if (isInternal) {
VDSStatus status = vds.getStatus();
switch (vds.getStatus()) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index f17ca51..3aa587b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -85,8 +85,10 @@
private HostMonitoring hostMonitoring;
private boolean monitoringNeeded;
private List<VM> lastVmsList = Collections.emptyList();
+ private final ResourceManager resourceManager;
- public VdsManager(VDS vds, AuditLogDirector auditLogDirector) {
+ public VdsManager(VDS vds, AuditLogDirector auditLogDirector,
ResourceManager resourceManager) {
+ this.resourceManager = resourceManager;
this.auditLogDirector = auditLogDirector;
log.info("Entered VdsManager constructor");
cachedVds = vds;
@@ -285,7 +287,7 @@
boolean updateAvailable;
try {
- updateAvailable =
ResourceManager.getInstance().isUpdateAvailable(cachedVds);
+ updateAvailable = resourceManager.isUpdateAvailable(cachedVds);
} catch (Exception e) {
log.error("Failed to check if updates are available for host {}",
cachedVds.getName());
@@ -385,13 +387,10 @@
VDS vds = DbFacade.getInstance().getVdsDao().get(getVdsId());
if (vds.getStatus() == VDSStatus.Initializing) {
try {
- ResourceManager
- .getInstance()
- .getEventListener()
- .vdsNonOperational(vds.getId(),
-
NonOperationalReason.TIMEOUT_RECOVERING_FROM_CRASH,
- true,
- Guid.Empty);
+
resourceManager.getEventListener().vdsNonOperational(vds.getId(),
+ NonOperationalReason.TIMEOUT_RECOVERING_FROM_CRASH,
+ true,
+ Guid.Empty);
setIsSetNonOperationalExecuted(true);
} catch (RuntimeException exp) {
log.error(
@@ -491,7 +490,7 @@
monitoringStrategy.processHardwareCapabilities(vds);
// Always check VdsVersion
-
ResourceManager.getInstance().getEventListener().handleVdsVersion(vds.getId());
+
resourceManager.getEventListener().handleVdsVersion(vds.getId());
}
}
}
@@ -582,7 +581,7 @@
&& mFailedToRunVmAttempts.incrementAndGet() >= Config
.<Integer>
getValue(ConfigValues.NumberOfFailedRunsOnVds)) {
//Only one thread at a time can enter here
-
ResourceManager.getInstance().runVdsCommand(VDSCommandType.SetVdsStatus,
+ resourceManager.runVdsCommand(VDSCommandType.SetVdsStatus,
new SetVdsStatusVDSCommandParameters(vds.getId(),
VDSStatus.Error));
SchedulerUtil sched = SchedulerUtilQuartzImpl.getInstance();
@@ -607,15 +606,15 @@
*/
public void succeededToRunVm(Guid vmId) {
mUnrespondedAttempts.set(0);
- ResourceManager.getInstance().succededToRunVm(vmId, getVdsId());
+ resourceManager.succededToRunVm(vmId, getVdsId());
}
public VDSStatus refreshCapabilities(AtomicBoolean
processHardwareCapsNeeded, VDS vds) {
log.debug("monitoring: refresh '{}' capabilities", vds);
VDS oldVDS = vds.clone();
- VDSReturnValue caps = ResourceManager.getInstance().runVdsCommand(
- VDSCommandType.GetCapabilities,
- new VdsIdAndVdsVDSCommandParametersBase(vds));
+ VDSReturnValue caps =
+ resourceManager.runVdsCommand(VDSCommandType.GetCapabilities,
+ new VdsIdAndVdsVDSCommandParametersBase(vds));
if (caps.getSucceeded()) {
// Verify version capabilities
HashSet<Version> hostVersions = null;
@@ -626,7 +625,7 @@
// host and an exception will be raised by VDSM.
(hostVersions = vds.getSupportedClusterVersionsSet()) != null
&&
hostVersions.contains(clusterCompatibility)) {
- VDSReturnValue ret =
ResourceManager.getInstance().runVdsCommand(VDSCommandType.GetHardwareInfo,
+ VDSReturnValue ret =
resourceManager.runVdsCommand(VDSCommandType.GetHardwareInfo,
new VdsIdAndVdsVDSCommandParametersBase(vds));
if (!ret.getSucceeded()) {
AuditLogableBase logable = new
AuditLogableBase(vds.getId());
@@ -730,7 +729,7 @@
setStatus(VDSStatus.NonResponsive, cachedVds);
moveVMsToUnknown();
logHostFailToRespond(ex, timeoutToFence);
-
ResourceManager.getInstance().getEventListener().vdsNotResponding(cachedVds);
+
resourceManager.getEventListener().vdsNotResponding(cachedVds);
} else {
setStatus(VDSStatus.NonResponsive, cachedVds);
}
@@ -875,9 +874,8 @@
List<VM> vmList = getVmsToMoveToUnknown();
for (VM vm :vmList) {
destroyVmOnDestination(vm);
- ResourceManager.getInstance()
- .runVdsCommand(VDSCommandType.SetVmStatus,
- new SetVmStatusVDSCommandParameters(vm.getId(),
VMStatus.Unknown));
+ resourceManager.runVdsCommand(VDSCommandType.SetVmStatus,
+ new SetVmStatusVDSCommandParameters(vm.getId(),
VMStatus.Unknown));
// log VM transition to unknown status
AuditLogableBase logable = new AuditLogableBase();
logable.setVmId(vm.getId());
@@ -895,12 +893,8 @@
public void run() {
VDSReturnValue returnValue = null;
returnValue =
- ResourceManager.getInstance()
- .runVdsCommand(
- VDSCommandType.DestroyVm,
- new
DestroyVmVDSCommandParameters(vm.getMigratingToVds()
- , vm.getId(), true, false, 0)
- );
+ resourceManager.runVdsCommand(VDSCommandType.DestroyVm,
+ new
DestroyVmVDSCommandParameters(vm.getMigratingToVds(), vm.getId(), true, false,
0));
if (returnValue != null && returnValue.getSucceeded()) {
log.info("Stopped migrating VM: '{}' on VDS: '{}'",
vm.getName(), vm.getMigratingToVds());
}
@@ -988,7 +982,7 @@
public void vmsMonitoringInitFinished() {
if (!isInitialized()) {
log.info("VMs initialization finished for Host: '{}:{}'",
cachedVds.getName(), cachedVds.getId());
-
ResourceManager.getInstance().handleVmsFinishedInitOnVds(cachedVds.getId());
+ resourceManager.handleVmsFinishedInitOnVds(cachedVds.getId());
setInitialized(true);
}
}
--
To view, visit https://gerrit.ovirt.org/40935
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I945f3ff94bf8022d4efc13bcec289edd85755749
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
