Moti Asayag has uploaded a new change for review. Change subject: engine: Avoid static access to DbFacade from VdsManager ......................................................................
engine: Avoid static access to DbFacade from VdsManager Change-Id: Ie76e5e3c8f66287200c28d2afc9a51d3961cc244 Signed-off-by: Moti Asayag <[email protected]> --- 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, 24 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/40939/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 2427da5..c223737 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 @@ -45,6 +45,7 @@ import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.VdsDAO; @@ -103,6 +104,9 @@ @Inject private VmNetworkStatisticsDao vmNetworkStatisticsDao; + + @Inject + private DbFacade dbFacade; private ResourceManager() { this.parallelism = Config.<Integer> getValue(ConfigValues.EventProcessingPoolSize); @@ -251,7 +255,7 @@ } public void AddVds(VDS vds, boolean isInternal) { - VdsManager vdsManager = new VdsManager(vds, auditLogDirector, this); + VdsManager vdsManager = new VdsManager(vds, auditLogDirector, this, dbFacade); 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 6328b2a..462e2ed 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 @@ -86,9 +86,11 @@ private boolean monitoringNeeded; private List<VM> lastVmsList = Collections.emptyList(); private final ResourceManager resourceManager; + private final DbFacade dbFacade; - public VdsManager(VDS vds, AuditLogDirector auditLogDirector, ResourceManager resourceManager) { + public VdsManager(VDS vds, AuditLogDirector auditLogDirector, ResourceManager resourceManager, DbFacade dbFacade) { this.resourceManager = resourceManager; + this.dbFacade = dbFacade; this.auditLogDirector = auditLogDirector; log.info("Entered VdsManager constructor"); cachedVds = vds; @@ -257,7 +259,7 @@ } private void refreshCachedVds() { - cachedVds = DbFacade.getInstance().getVdsDao().get(getVdsId()); + cachedVds = dbFacade.getVdsDao().get(getVdsId()); setMonitoringNeeded(); } @@ -301,7 +303,7 @@ synchronized (getLockObj()) { if (updateAvailable != cachedVds.isUpdateAvailable()) { cachedVds.getDynamicData().setUpdateAvailable(updateAvailable); - DbFacade.getInstance().getVdsDynamicDao().updateUpdateAvailable(cachedVds.getId(), updateAvailable); + dbFacade.getVdsDynamicDao().updateUpdateAvailable(cachedVds.getId(), updateAvailable); } } } @@ -363,7 +365,7 @@ private void handleVdsRecoveringException(VDSRecoveringException ex) { if (cachedVds.getStatus() != VDSStatus.Initializing && cachedVds.getStatus() != VDSStatus.NonOperational) { setStatus(VDSStatus.Initializing, cachedVds); - DbFacade.getInstance().getVdsDynamicDao().updateStatus(cachedVds.getId(), VDSStatus.Initializing); + dbFacade.getVdsDynamicDao().updateStatus(cachedVds.getId(), VDSStatus.Initializing); AuditLogableBase logable = new AuditLogableBase(cachedVds.getId()); logable.addCustomValue("ErrorMessage", ex.getMessage()); logable.updateCallStackFromThrowable(ex); @@ -384,7 +386,7 @@ @OnTimerMethodAnnotation("onTimerHandleVdsRecovering") public void onTimerHandleVdsRecovering() { recoveringJobIdMap.remove(getVdsId()); - VDS vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); + VDS vds = dbFacade.getVdsDao().get(getVdsId()); if (vds.getStatus() == VDSStatus.Initializing) { try { resourceManager.getEventListener().vdsNonOperational(vds.getId(), @@ -409,7 +411,7 @@ * @param dynamicData */ public void updateDynamicData(VdsDynamic dynamicData) { - DbFacade.getInstance().getVdsDynamicDao().updateIfNeeded(dynamicData); + dbFacade.getVdsDynamicDao().updateIfNeeded(dynamicData); cachedVds.setDynamicData(dynamicData); } @@ -419,7 +421,7 @@ * @param statisticsData */ public void updateStatisticsData(VdsStatistics statisticsData) { - DbFacade.getInstance().getVdsStatisticsDao().update(statisticsData); + dbFacade.getVdsStatisticsDao().update(statisticsData); cachedVds.setStatisticsData(statisticsData); } @@ -437,8 +439,7 @@ final List<VdsNumaNode> numaNodesToUpdate = new ArrayList<>(); final List<Guid> numaNodesToRemove = new ArrayList<>(); - List<VdsNumaNode> dbVdsNumaNodes = DbFacade.getInstance() - .getVdsNumaNodeDAO().getAllVdsNumaNodeByVdsId(vds.getId()); + List<VdsNumaNode> dbVdsNumaNodes = dbFacade.getVdsNumaNodeDAO().getAllVdsNumaNodeByVdsId(vds.getId()); for (VdsNumaNode node : vds.getNumaNodeList()) { VdsNumaNode searchNode = NumaUtils.getVdsNumaNodeByIndex(dbVdsNumaNodes, node.getIndex()); if (searchNode != null) { @@ -461,17 +462,13 @@ @Override public Void runInTransaction() { if (!numaNodesToRemove.isEmpty()) { - DbFacade.getInstance() - .getVdsNumaNodeDAO() - .massRemoveNumaNodeByNumaNodeId(numaNodesToRemove); + dbFacade.getVdsNumaNodeDAO().massRemoveNumaNodeByNumaNodeId(numaNodesToRemove); } if (!numaNodesToUpdate.isEmpty()) { - DbFacade.getInstance().getVdsNumaNodeDAO().massUpdateNumaNode(numaNodesToUpdate); + dbFacade.getVdsNumaNodeDAO().massUpdateNumaNode(numaNodesToUpdate); } if (!numaNodesToSave.isEmpty()) { - DbFacade.getInstance() - .getVdsNumaNodeDAO() - .massSaveNumaNode(numaNodesToSave, vds.getId(), null); + dbFacade.getVdsNumaNodeDAO().massSaveNumaNode(numaNodesToSave, vds.getId(), null); } return null; } @@ -498,7 +495,7 @@ public void setStatus(VDSStatus status, VDS vds) { synchronized (getLockObj()) { if (vds == null) { - vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); + vds = dbFacade.getVdsDao().get(getVdsId()); } if (vds.getStatus() != status) { if (status == VDSStatus.PreparingForMaintenance) { @@ -554,14 +551,14 @@ */ @OnTimerMethodAnnotation("recoverFromError") public void recoverFromError() { - VDS vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); + VDS vds = dbFacade.getVdsDao().get(getVdsId()); /** * Move cachedVds to Up status from error */ if (vds != null && vds.getStatus() == VDSStatus.Error) { setStatus(VDSStatus.Up, vds); - DbFacade.getInstance().getVdsDynamicDao().updateStatus(getVdsId(), VDSStatus.Up); + dbFacade.getVdsDynamicDao().updateStatus(getVdsId(), VDSStatus.Up); log.info("Settings host '{}' to up after {} failed attempts to run a VM", vds.getName(), mFailedToRunVmAttempts); @@ -664,7 +661,7 @@ if (oldStatus != VDSStatus.Up) { // persist to db the host's cpu_flags. // TODO this needs to be revisited - either all the logic is in-memory or based on db - DbFacade.getInstance().getVdsDynamicDao().updateCpuFlags(vds.getId(), vds.getCpuFlags()); + dbFacade.getVdsDynamicDao().updateCpuFlags(vds.getId(), vds.getCpuFlags()); monitoringStrategy.processHardwareCapabilities(vds); } monitoringStrategy.processSoftwareCapabilities(vds); @@ -907,10 +904,8 @@ } private List<VM> getVmsToMoveToUnknown() { - List<VM> vmList = DbFacade.getInstance().getVmDao().getAllRunningForVds( - getVdsId()); - List<VM> migratingVms = DbFacade.getInstance().getVmDao().getAllMigratingToHost( - getVdsId()); + List<VM> vmList = dbFacade.getVmDao().getAllRunningForVds(getVdsId()); + List<VM> migratingVms = dbFacade.getVmDao().getAllMigratingToHost(getVdsId()); for (VM incomingVm : migratingVms) { if (incomingVm.getStatus() == VMStatus.MigratingTo) { // this VM is finished the migration handover and is running on this host now -- To view, visit https://gerrit.ovirt.org/40939 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie76e5e3c8f66287200c28d2afc9a51d3961cc244 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
