Michael Kublin has uploaded a new change for review.
Change subject: engine: Exception rush
......................................................................
engine: Exception rush
The following patch will remove all unused exceptions all over a code.
The exception was not used, was not thrown but sometimes was catched.
Also I removed some unused enum.
Change-Id: Ic983626d48c6535eeaa23a9c858c20ed7fa86a2c
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ResourceManagerException.java
D
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DBFacadException.java
D
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/RepositoryException.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IRSErrorImageNotExistException.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImportEnumsManager.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorImportCandidateMissing.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorIrsDbMissing.java
11 files changed, 17 insertions(+), 205 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/8947/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index e2d9890..3cba88e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -68,7 +68,6 @@
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
-import org.ovirt.engine.core.dal.dbbroker.generic.RepositoryException;
import org.ovirt.engine.core.dal.job.ExecutionMessageDirector;
import org.ovirt.engine.core.dao.BusinessEntitySnapshotDAO;
import org.ovirt.engine.core.dao.GenericDao;
@@ -876,11 +875,7 @@
}
functionReturnValue = getSucceeded();
exceptionOccurred = false;
- } catch (RepositoryException e) {
- log.error(String.format("Command %1$s throw Database exception",
getClass().getName()), e);
- processExceptionToClient(new VdcFault(e, VdcBllErrors.DB));
- }
- catch (VdcBLLException e) {
+ } catch (VdcBLLException e) {
log.error(String.format("Command %1$s throw Vdc Bll exception.
With error message %2$s",
getClass().getName(),
e.getMessage()));
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ResourceManagerException.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ResourceManagerException.java
deleted file mode 100644
index 96a462f..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ResourceManagerException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.compat.*;
-
-public class ResourceManagerException extends ApplicationException implements
java.io.Serializable {
- // protected ResourceManagerException(SerializationInfo info,
- // StreamingContext context)
- // {
- // super(info, context);
- // }
- //
- public ResourceManagerException(RuntimeException baseException) {
- super("ResourceManagerException", baseException);
- }
-
- public ResourceManagerException(String errorStr) {
- super(errorStr);
-
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DBFacadException.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DBFacadException.java
deleted file mode 100644
index d876a2a..0000000
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DBFacadException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.dal.dbbroker;
-
-import org.ovirt.engine.core.compat.*;
-
-public class DBFacadException extends ApplicationException implements
java.io.Serializable {
- private static final long serialVersionUID = -1759699263394287948L;
-
- // protected DBFacadException(SerializationInfo info, StreamingContext
- // context)
- // {
- // super(info,context);
- // }
- //
- public DBFacadException() {
- }
-
- public DBFacadException(String errorStr, Throwable cause) {
- super("DBFacadException: " + errorStr, cause);
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/RepositoryException.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/RepositoryException.java
deleted file mode 100644
index bac9455..0000000
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/RepositoryException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.ovirt.engine.core.dal.dbbroker.generic;
-
-import org.ovirt.engine.core.compat.*;
-
-/**
- * This class is the base class for all exceptions from our repositories.
- */
-public class RepositoryException extends ApplicationException implements
java.io.Serializable {
- private static final long serialVersionUID = -8256930086206446087L;
- // public RepositoryException()
- // {
- // }
- //
- // public RepositoryException(String message)
- // {
- // super(message);
- // }
- //
- // public RepositoryException(String message, RuntimeException inner)
- // {
- // super(message, inner);
- // }
- //
- // protected RepositoryException(SerializationInfo info, StreamingContext
- // context)
- // {
- // super(info, context);
- // }
- // private static Log log =
- // LogFactory.getLog(RepositoryException.class);
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java
index 56d9f7c..11eacf9 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.core.common.businessentities.VmNetworkStatistics;
import org.ovirt.engine.core.common.vdscommands.DestroyVmVDSCommandParameters;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.dal.dbbroker.generic.RepositoryException;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
@@ -47,28 +46,17 @@
@Override
public Void runInTransaction() {
- try {
- curVm.guestLogoutTimeTreatmentAfterDestroy();
- // SaveVmDynamicToDBThreaded(curVm);
-
DbFacade.getInstance().getVmDynamicDao().update(curVm.getDynamicData());
-
DbFacade.getInstance().getVmStatisticsDao().update(curVm.getStatisticsData());
- List<VmNetworkInterface> interfaces =
curVm.getInterfaces();
- if (interfaces != null && interfaces.size() > 0) {
- for (VmNetworkInterface ifc : interfaces) {
- VmNetworkStatistics stats =
ifc.getStatistics();
-
DbFacade.getInstance().getVmNetworkStatisticsDao().update(stats);
- }
+ curVm.guestLogoutTimeTreatmentAfterDestroy();
+ // SaveVmDynamicToDBThreaded(curVm);
+
DbFacade.getInstance().getVmDynamicDao().update(curVm.getDynamicData());
+
DbFacade.getInstance().getVmStatisticsDao().update(curVm.getStatisticsData());
+ List<VmNetworkInterface> interfaces =
curVm.getInterfaces();
+ if (interfaces != null && interfaces.size() > 0) {
+ for (VmNetworkInterface ifc : interfaces) {
+ VmNetworkStatistics stats =
ifc.getStatistics();
+
DbFacade.getInstance().getVmNetworkStatisticsDao().update(stats);
}
- } catch (RepositoryException ex) {
- log.errorFormat(
- "VDS::destroy Failed to update vds status
in database, vds = {1} : {2}, error = {3}",
- getVds().getId(),
- getVds().getvds_name(),
- ex.getMessage());
- log.error("Exception: ", ex);
- throw ex;
}
-
getVds().setmem_commited(getVds().getmem_commited() -
curVm.getvm_mem_size_mb());
getVds().setmem_commited(getVds().getmem_commited() -
getVds().getguest_overhead());
getVds().setvms_cores_count(getVds().getvms_cores_count() -
curVm.getnum_of_cpus());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 05bca1f..80c6413 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -52,7 +52,6 @@
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.dal.dbbroker.generic.RepositoryException;
import org.ovirt.engine.core.dao.MassOperationsDao;
import org.ovirt.engine.core.utils.NetworkUtils;
import org.ovirt.engine.core.utils.ObjectIdentityChecker;
@@ -860,11 +859,6 @@
} else if (command.getVDSReturnValue().getExceptionObject()
instanceof VDSProtocolException) {
log.errorFormat("Failed vds listing, vds = {0} : {1}, error =
{2}", _vds.getId(),
_vds.getvds_name(),
command.getVDSReturnValue().getExceptionString());
- } else if (command.getVDSReturnValue().getExceptionObject()
instanceof RepositoryException) {
- log.errorFormat("Failed to update vms status in database, vds
= {0} : {1}, error = {2}",
- _vds.getId(), _vds.getvds_name(),
command.getVDSReturnValue().getExceptionString());
- log.error("Exception: ",
command.getVDSReturnValue().getExceptionObject());
- return;
}
throw command.getVDSReturnValue().getExceptionObject();
} else {
@@ -1492,22 +1486,13 @@
private void MoveVDSToMaintenanceIfNeeded() {
if ((_vds.getstatus() == VDSStatus.PreparingForMaintenance)
&& monitoringStrategy.canMoveToMaintenance(_vds)) {
- try {
- _vdsManager.setStatus(VDSStatus.Maintenance, _vds);
- _saveVdsDynamic = true;
- _saveVdsStatistics = true;
- log.infoFormat(
- "vds::Updated vds status from 'Preparing for
Maintenance' to 'Maintenance' in database, vds = {0} : {1}",
- _vds.getId(),
- _vds.getvds_name());
- } catch (RepositoryException ex) {
- log.errorFormat(
- "vds::Failed to update vds status from 'Preparing for
Maintenance' to 'Maintenance' in database, vds = {0} : {1}, error = {2}",
- _vds.getId(),
- _vds.getvds_name(),
- ExceptionUtils.getMessage(ex));
- log.error("Exception: ", ex);
- }
+ _vdsManager.setStatus(VDSStatus.Maintenance, _vds);
+ _saveVdsDynamic = true;
+ _saveVdsStatistics = true;
+ log.infoFormat(
+ "vds::Updated vds status from 'Preparing for Maintenance'
to 'Maintenance' in database, vds = {0} : {1}",
+ _vds.getId(),
+ _vds.getvds_name());
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IRSErrorImageNotExistException.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IRSErrorImageNotExistException.java
deleted file mode 100644
index 64937bf..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IRSErrorImageNotExistException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-public class IRSErrorImageNotExistException extends IRSErrorException
implements java.io.Serializable {
- // protected IRSErrorImageNotExistException(SerializationInfo info,
- // StreamingContext context)
- // {
- // super(info, context);
- // }
- public IRSErrorImageNotExistException(RuntimeException baseException) {
- super(baseException);
- }
-
- public IRSErrorImageNotExistException(String errorStr) {
- super(errorStr);
-
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImportEnumsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImportEnumsManager.java
deleted file mode 100644
index 741f9b7..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImportEnumsManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import org.ovirt.engine.core.common.queries.*;
-
-public final class ImportEnumsManager {
- private static java.util.HashMap<ImportCandidateSourceEnum, String>
CandidateSourceEnumStrings;
- private static java.util.HashMap<ImportCandidateTypeEnum, String>
CandidateTypeEnumStrings;
-
- static {
- CandidateSourceEnumStrings = new
java.util.HashMap<ImportCandidateSourceEnum, String>();
- CandidateSourceEnumStrings.put(ImportCandidateSourceEnum.KVM,
"qumranet");
- CandidateSourceEnumStrings.put(ImportCandidateSourceEnum.VMWARE,
"vmware");
-
- CandidateTypeEnumStrings = new
java.util.HashMap<ImportCandidateTypeEnum, String>();
- CandidateTypeEnumStrings.put(ImportCandidateTypeEnum.VM, "vms");
- CandidateTypeEnumStrings.put(ImportCandidateTypeEnum.TEMPLATE,
"templates");
- }
-
- public static String CandidateSourceString(ImportCandidateSourceEnum
source) {
- return CandidateSourceEnumStrings.get(source);
- }
-
- public static String CandidateTypeString(ImportCandidateTypeEnum type) {
- return CandidateTypeEnumStrings.get(type);
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
index ddd990e..f3b46da 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
@@ -1608,14 +1608,6 @@
throw new IRSProtocolException(ex);
}
}
- catch (IrsErrorIrsDbMissing ex) {
- getVDSReturnValue().setExceptionString(ex.toString());
- getVDSReturnValue().setExceptionObject(ex);
- getVDSReturnValue().setVdsError(ex.getVdsError());
- log.errorFormat("IrsBroker::Failed::{0}", getCommandName());
- LoggedUtils.logError(log, LoggedUtils.getObjectId(this), this,
ex);
- failover();
- }
catch (IRSNoMasterDomainException ex) {
getVDSReturnValue().setExceptionString(ex.toString());
getVDSReturnValue().setExceptionObject(ex);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorImportCandidateMissing.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorImportCandidateMissing.java
deleted file mode 100644
index 8e67146..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorImportCandidateMissing.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-public class IrsErrorImportCandidateMissing extends IRSErrorException
implements java.io.Serializable {
- // protected IrsErrorImportCandidateMissing(SerializationInfo info,
- // StreamingContext context)
- // {
- // super(info, context);
- // }
- public IrsErrorImportCandidateMissing(RuntimeException baseException) {
- super(baseException);
- }
-
- public IrsErrorImportCandidateMissing(String errorStr) {
- super(errorStr);
-
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorIrsDbMissing.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorIrsDbMissing.java
deleted file mode 100644
index d49694a..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsErrorIrsDbMissing.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-public class IrsErrorIrsDbMissing extends IRSErrorException implements
java.io.Serializable {
- // protected IrsErrorIrsDbMissing(SerializationInfo info, StreamingContext
- // context)
- // {
- // super(info, context);
- // }
- public IrsErrorIrsDbMissing(RuntimeException baseException) {
- super(baseException);
- }
-
- public IrsErrorIrsDbMissing(String errorStr) {
- super(errorStr);
-
- }
-}
--
To view, visit http://gerrit.ovirt.org/8947
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic983626d48c6535eeaa23a9c858c20ed7fa86a2c
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
