Michael Kublin has uploaded a new change for review.
Change subject: engine: Removing all unneeded staff from VdsIdVDSCommandBase
......................................................................
engine: Removing all unneeded staff from VdsIdVDSCommandBase
1. Removed garbage comments
2. Removed method which is creates quartz task for update vds dynamic data
3. Removed call for that method from CreateVmVDSCommand - call is unneeded
similar update is done at next line
The patch is not only cleans, it is also reduced unneeded update query and
quartz task creation on every run vm
Change-Id: Ida4f92f70d24634e3fb76d675ba81c936a487288
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java
2 files changed, 0 insertions(+), 58 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/8496/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
index a2e362a..7705811 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java
@@ -117,7 +117,6 @@
getVds().getpending_vmem_size() +
getParameters().getVm().getMinAllocatedMem());
log.infoFormat("IncreasePendingVms::CreateVmIncreasing vds {0} pending
vcpu count, now {1}. Vm: {2}", getVds()
.getvds_name(), getVds().getpending_vcpus_count(),
getParameters().getVm().getvm_name());
- SaveVdsDynamicToDBThreaded(getVds(), getParameters().getVm());
_vdsManager.UpdateDynamicData(getVds().getDynamicData());
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java
index 16ab6af..bb46e63 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java
@@ -1,16 +1,9 @@
package org.ovirt.engine.core.vdsbroker;
-import java.util.concurrent.TimeUnit;
-
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.VM;
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.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation;
-import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl;
public abstract class VdsIdVDSCommandBase<P extends
VdsIdVDSCommandParametersBase> extends VDSCommandBase<P> {
protected VdsManager _vdsManager;
@@ -54,54 +47,4 @@
}
protected abstract void ExecuteVdsIdCommand();
-
- // protected void SaveVmDynamicToDBThreaded(VM vm)
- // {
- // ThreadPoolCompat.QueueUserWorkItem(delegate
- // {
- // for (int i = 1; i < 6; i++)
- // {
- // try
- // {
- // DbFacade.Instance.SaveVmDynamic(vm.DynamicData);
- // return;
- // }
- // catch (Exception ex)
- // {
- // log.infoFormat("ResourceManager::Failed save vm dynamic to DB, try
number {4}. vm: {0} in vds = {1} : {2} error = {3}",
- // vm.vm_name, _vdsManager.Vds.vds_id, _vdsManager.Vds.vds_name,
ex.Message,
- // i);
- // ThreadCompat.Sleep(1000);
- // }
- // }
- // log.errorFormat("ResourceManager::Failed save vm dynamic to DB. vm: {0}
in vds = {1} : {2}. command name: {3}.",
- // vm.vm_name, _vdsManager.Vds.vds_id, _vdsManager.Vds.vds_name,
- // CommandName);
- // });
- // }
-
- protected void SaveVdsDynamicToDBThreaded(VDS vds, VM vm) {
- // TODO should use thread poo and not timer
- Class<?>[] inputTypes = new Class[] { VDS.class, VM.class };
- Object[] inputParams = new Object[] { vds, vm };
- SchedulerUtilQuartzImpl.getInstance().scheduleAOneTimeJob(this,
"saveVdsDynamicToDBOnTimer", inputTypes,
- inputParams, 0, TimeUnit.MILLISECONDS);
- }
-
- @OnTimerMethodAnnotation("saveVdsDynamicToDBOnTimer")
- public void saveVdsDynamicToDBOnTimer(VDS vds, VM vm) {
- try {
- _vdsManager.UpdateDynamicData(vds.getDynamicData());
- } catch (RuntimeException ex) {
- log.errorFormat(
- "ResourceManager::Failed save vds dynamic to DB. vm: {0}
in vds = {1} : {2} error = {3}. command name: {3}.",
- vm.getvm_name(),
- vds.getId(),
- vds.getvds_name(),
- ex.getMessage(),
- getCommandName());
- }
- }
-
- private static Log log = LogFactory.getLog(VdsIdVDSCommandBase.class);
}
--
To view, visit http://gerrit.ovirt.org/8496
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida4f92f70d24634e3fb76d675ba81c936a487288
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
