Roy Golan has uploaded a new change for review. Change subject: core: Inject backend instead of using getInstance ......................................................................
core: Inject backend instead of using getInstance Change-Id: I166b9f215b5bd7f73b39888bbb5e61cc3447a74a Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java 1 file changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/40630/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index a9fc63f..e499ec2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -88,6 +88,8 @@ private SchedulingManager schedulingManager; @Inject private AuditLogDirector auditLogDirector; + @Inject + private Backend backend; private static final Logger log = LoggerFactory.getLogger(VdsEventListener.class); @@ -120,14 +122,14 @@ .get(vds.getStoragePoolId()); if (StoragePoolStatus.Uninitialized != storage_pool .getStatus()) { - Backend.getInstance().getResourceManager() + backend.getResourceManager() .RunVdsCommand( VDSCommandType.DisconnectStoragePool, new DisconnectStoragePoolVDSCommandParameters(vds.getId(), vds.getStoragePoolId(), vds.getVdsSpmId())); HostStoragePoolParametersBase params = new HostStoragePoolParametersBase(storage_pool, vds); - Backend.getInstance().runInternalAction(VdcActionType.DisconnectHostFromStoragePoolServers, params); + backend.runInternalAction(VdcActionType.DisconnectHostFromStoragePoolServers, params); } } finally { LockManagerFactory.getLockManager().releaseLock(lock); @@ -158,7 +160,7 @@ new StorageDomainPoolParametersBase(storageDomainId, storagePoolId); parameters.setIsInternal(true); parameters.setInactive(true); - boolean isSucceeded = Backend.getInstance().runInternalAction(VdcActionType.DeactivateStorageDomain, + boolean isSucceeded = backend.runInternalAction(VdcActionType.DeactivateStorageDomain, parameters, ExecutionHandler.createInternalJobContext()).getSucceeded(); return new EventResult(isSucceeded, EventType.DOMAINNOTOPERATIONAL); @@ -175,7 +177,7 @@ true, isReconstructToInactiveDomains, canReconstructToCurrentMaster); - boolean isSucceeded = Backend.getInstance().runInternalAction(VdcActionType.ReconstructMasterDomain, + boolean isSucceeded = backend.runInternalAction(VdcActionType.ReconstructMasterDomain, parameters, ExecutionHandler.createInternalJobContext()).getSucceeded(); return new EventResult(isSucceeded, EventType.RECONSTRUCT); @@ -191,7 +193,7 @@ @Override public void run() { for (Guid vmId : vmIds) { - Backend.getInstance().runInternalAction(VdcActionType.ProcessDownVm, + backend.runInternalAction(VdcActionType.ProcessDownVm, new IdParameters(vmId)); } } @@ -211,7 +213,7 @@ public void run() { StorageDomainParametersBase parameters = new StorageDomainParametersBase(storageDomainId); parameters.setVdsId(vdsId); - Backend.getInstance().runInternalAction(VdcActionType.SyncLunsInfoForBlockStorageDomain, parameters); + backend.runInternalAction(VdcActionType.SyncLunsInfoForBlockStorageDomain, parameters); } }); } @@ -234,7 +236,7 @@ new SetNonOperationalVdsParameters(vdsId, reason, customLogValues); tempVar.setStorageDomainId(domainId); tempVar.setShouldBeLogged(logCommand); - Backend.getInstance().runInternalAction(VdcActionType.SetNonOperationalVds, tempVar, ExecutionHandler.createInternalJobContext()); + backend.runInternalAction(VdcActionType.SetNonOperationalVds, tempVar, ExecutionHandler.createInternalJobContext()); } @Override @@ -248,7 +250,7 @@ vds.getHostName()); FenceVdsActionParameters params = new FenceVdsActionParameters(vds.getId()); - Backend.getInstance().runInternalAction(VdcActionType.VdsNotRespondingTreatment, + backend.runInternalAction(VdcActionType.VdsNotRespondingTreatment, params, ExecutionHandler.createInternalJobContext()); @@ -270,7 +272,7 @@ @Override public boolean vdsUpEvent(final VDS vds) { HostStoragePoolParametersBase params = new HostStoragePoolParametersBase(vds); - boolean isSucceeded = Backend.getInstance().runInternalAction(VdcActionType.InitVdsOnUp, params).getSucceeded(); + boolean isSucceeded = backend.runInternalAction(VdcActionType.InitVdsOnUp, params).getSucceeded(); if (isSucceeded) { ThreadPoolUtil.execute(new Runnable() { @Override @@ -283,7 +285,7 @@ if (!vmsToMigrate.isEmpty()) { CommandContext ctx = new CommandContext(new EngineContext()); ctx.getExecutionContext().setMonitored(true); - Backend.getInstance().runInternalMultipleActions(VdcActionType.MigrateVmToServer, + backend.runInternalMultipleActions(VdcActionType.MigrateVmToServer, new ArrayList<>(createMigrateVmToServerParametersList(vmsToMigrate, vds)), ctx); } @@ -300,7 +302,7 @@ @Override public boolean connectHostToDomainsInActiveOrUnknownStatus(VDS vds) { ConnectHostToStoragePoolServersParameters params = new ConnectHostToStoragePoolServersParameters(vds, false); - return Backend.getInstance().runInternalAction(VdcActionType.ConnectHostToStoragePoolServers, params).getSucceeded(); + return backend.runInternalAction(VdcActionType.ConnectHostToStoragePoolServers, params).getSucceeded(); } @@ -339,18 +341,18 @@ @Override public void processOnCpuFlagsChange(Guid vdsId) { - Backend.getInstance().runInternalAction(VdcActionType.HandleVdsCpuFlagsOrClusterChanged, + backend.runInternalAction(VdcActionType.HandleVdsCpuFlagsOrClusterChanged, new VdsActionParameters(vdsId)); } @Override public void handleVdsVersion(Guid vdsId) { - Backend.getInstance().runInternalAction(VdcActionType.HandleVdsVersion, new VdsActionParameters(vdsId)); + backend.runInternalAction(VdcActionType.HandleVdsVersion, new VdsActionParameters(vdsId)); } @Override public void processOnVmPoweringUp(Guid vmId) { - IVdsAsyncCommand command = Backend.getInstance().getResourceManager().GetAsyncCommandForVm(vmId); + IVdsAsyncCommand command = backend.getResourceManager().GetAsyncCommandForVm(vmId); if (command != null) { command.onPowerringUp(); @@ -377,7 +379,7 @@ if (transactionScopeOption != null) { tempVar.setTransactionScopeOption(transactionScopeOption); } - Backend.getInstance().runInternalAction(VdcActionType.SetStoragePoolStatus, tempVar); + backend.runInternalAction(VdcActionType.SetStoragePoolStatus, tempVar); } @Override @@ -404,7 +406,7 @@ public void addExternallyManagedVms(List<VmStatic> externalVmList) { for (VmStatic currVm : externalVmList) { AddVmParameters params = new AddVmParameters(currVm); - VdcReturnValueBase returnValue = Backend.getInstance().runInternalAction(VdcActionType.AddVmFromScratch, params, ExecutionHandler.createInternalJobContext()); + VdcReturnValueBase returnValue = backend.runInternalAction(VdcActionType.AddVmFromScratch, params, ExecutionHandler.createInternalJobContext()); if (!returnValue.getSucceeded()) { log.debug("Failed adding Externally managed VM '{}'", currVm.getName()); } @@ -414,13 +416,13 @@ @Override public void handleVdsMaintenanceTimeout(Guid vdsId) { // try to put the host to Maintenance again. - Backend.getInstance().runInternalAction(VdcActionType.MaintenanceNumberOfVdss, + backend.runInternalAction(VdcActionType.MaintenanceNumberOfVdss, new MaintenanceNumberOfVdssParameters(Arrays.asList(vdsId), true)); } @Override public void rerun(Guid vmId) { - final IVdsAsyncCommand command = Backend.getInstance().getResourceManager().GetAsyncCommandForVm(vmId); + final IVdsAsyncCommand command = backend.getResourceManager().GetAsyncCommandForVm(vmId); if (command != null) { // The command will be invoked in a different VDS in its rerun method, so we're calling // its rerun method from a new thread so that it won't be executed within our current VDSM lock @@ -435,7 +437,7 @@ @Override public void runningSucceded(Guid vmId) { - IVdsAsyncCommand command = Backend.getInstance().getResourceManager().GetAsyncCommandForVm(vmId); + IVdsAsyncCommand command = backend.getResourceManager().GetAsyncCommandForVm(vmId); if (command != null) { command.runningSucceded(); } @@ -443,7 +445,7 @@ @Override public void removeAsyncRunningCommand(Guid vmId) { - IVdsAsyncCommand command = Backend.getInstance().getResourceManager().RemoveAsyncRunningCommand(vmId); + IVdsAsyncCommand command = backend.getResourceManager().RemoveAsyncRunningCommand(vmId); if (command != null) { command.reportCompleted(); } -- To view, visit https://gerrit.ovirt.org/40630 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I166b9f215b5bd7f73b39888bbb5e61cc3447a74a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
