Michael Kublin has uploaded a new change for review.
Change subject: engine: Simplify host life cycle - removed unneeded
SetNonOperational
......................................................................
engine: Simplify host life cycle - removed unneeded SetNonOperational
The following code is uselles, I don't see any reason to set host again to
NonOperational
when its status was already NonOperational, the condiiton described in if - it
is a bug and
if will occurred will be fixed accordingly
Change-Id: I800beee3d38c3b1036cb82440d67ef744ac5dbae
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
1 file changed, 2 insertions(+), 32 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/12165/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
index d85991e..018226d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
@@ -9,10 +9,8 @@
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.ovirt.engine.core.bll.job.ExecutionHandler;
import org.ovirt.engine.core.bll.tasks.AsyncTaskUtils;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.SetNonOperationalVdsParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskParameters;
@@ -20,9 +18,6 @@
import org.ovirt.engine.core.common.businessentities.AsyncTaskResultEnum;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
-import org.ovirt.engine.core.common.businessentities.NonOperationalReason;
-import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
@@ -32,7 +27,6 @@
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.compat.DateTime;
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.utils.linq.LinqUtils;
@@ -107,7 +101,7 @@
@OnTimerMethodAnnotation("_cacheTimer_Elapsed")
public void _cacheTimer_Elapsed() {
- removeOldAndCleanedTasks();
+ removeClearedAndOldTasks();
}
/**
@@ -330,7 +324,7 @@
*
* @return
*/
- synchronized private Set<Guid> removeClearedAndOldTasks() {
+ synchronized private void removeClearedAndOldTasks() {
Set<Guid> poolsOfActiveTasks = new HashSet<Guid>();
Set<Guid> poolsOfClearedAndOldTasks = new HashSet<Guid>();
Map<Guid, SPMAsyncTask> activeTaskMap = new HashMap<Guid,
SPMAsyncTask>();
@@ -348,33 +342,9 @@
setNewMap(activeTaskMap);
poolsOfClearedAndOldTasks.removeAll(poolsOfActiveTasks);
}
-
- return poolsOfClearedAndOldTasks;
- }
-
- private void removeOldAndCleanedTasks() {
-
- Set<Guid> poolsOfClearedAndOldTasks = removeClearedAndOldTasks();
-
for (Guid storagePoolID : poolsOfClearedAndOldTasks) {
log.infoFormat("Cleared all tasks of pool {0}.",
storagePoolID);
- storage_pool storagePool =
DbFacade.getInstance().getStoragePoolDao().get(storagePoolID);
- if (storagePool != null && storagePool.getspm_vds_id() != null) {
- VDS vds =
DbFacade.getInstance().getVdsDao().get(storagePool.getspm_vds_id());
- if (vds != null && vds.getStatus() ==
VDSStatus.NonOperational) {
- log.infoFormat(
- "Vds {0} is spm and non-operational, calling
SetNonOperationalVds",
- vds.getName());
- SetNonOperationalVdsParameters tempVar = new
SetNonOperationalVdsParameters(vds.getId(),
- NonOperationalReason.GENERAL);
- tempVar.setSaveToDb(true);
- tempVar.setShouldBeLogged(false);
-
Backend.getInstance().runInternalAction(VdcActionType.SetNonOperationalVds,
tempVar, ExecutionHandler.createInternalJobContext());
- } else {
- log.info("Could not find vds that is spm and
non-operational.");
- }
- }
}
}
--
To view, visit http://gerrit.ovirt.org/12165
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I800beee3d38c3b1036cb82440d67ef744ac5dbae
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
