Michael Kublin has uploaded a new change for review. Change subject: core: Removed un needed run of code in Suppres mode ......................................................................
core: Removed un needed run of code in Suppres mode The following patch will remove un needed run of code in Suppress mode. The following code is already run with out scope of any transaction, no need explicity to remove it. Motivation: less code - better redability, less look ups - better performance, less anonymous class - better memory. Change-Id: Ib79f8f8d5321de125efee17e5ae4083245885f32 Bug-Url: NA Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 1 file changed, 56 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/8231/1 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 676a6ca..15676c8 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 @@ -25,7 +25,6 @@ import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.KeyValuePairCompat; -import org.ovirt.engine.core.compat.TransactionScopeOption; 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; @@ -35,8 +34,6 @@ import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; import org.ovirt.engine.core.utils.timer.SchedulerUtil; import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl; -import org.ovirt.engine.core.utils.transaction.TransactionMethod; -import org.ovirt.engine.core.utils.transaction.TransactionSupport; import org.ovirt.engine.core.vdsbroker.irsbroker.IRSErrorException; import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand; import org.ovirt.engine.core.vdsbroker.vdsbroker.CollectVdsNetworkDataVDSCommand; @@ -214,67 +211,51 @@ ArrayList<VDSDomainsData> domainsList = null; synchronized (getLockObj()) { - TransactionSupport.executeInScope(TransactionScopeOption.Suppress, new TransactionMethod<Object>() { - @Override - public Object runInTransaction() { - { - _vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); - if (_vds == null) { - log.errorFormat("ResourceManager::refreshVdsRunTimeInfo - OnTimer is NULL for {0}", - getVdsId()); - return null; - } + _vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); + if (_vds == null) { + log.errorFormat("VdsManager::refreshVdsRunTimeInfo - OnTimer is NULL for {0}", + getVdsId()); + return; + } - try { - if (_refreshIteration == _numberRefreshesBeforeSave) { - _refreshIteration = 1; - } else { - _refreshIteration++; - } - if (isMonitoringNeeded()) { - setStartTime(); - _vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, _vds); - _vdsUpdater.Refresh(); - mUnrespondedAttempts.set(0); - setLastUpdate(); - } - if (!getInitialized() && getVds().getstatus() != VDSStatus.NonResponsive - && getVds().getstatus() != VDSStatus.PendingApproval) { - log.info("Initializing Host: " + getVds().getvds_name()); - ResourceManager.getInstance().HandleVdsFinishedInit(_vds.getId()); - setInitialized(true); - } - } catch (VDSNetworkException e) { - logNetworkException(e); - } catch (VDSRecoveringException ex) { - HandleVdsRecoveringException(ex); - } catch (IRSErrorException ex) { - logFailureMessage(ex); - if (log.isDebugEnabled()) { - logException(ex); - } - } catch (RuntimeException ex) { - logFailureMessage(ex); - logException(ex); - } - - } - return null; + try { + if (_refreshIteration == _numberRefreshesBeforeSave) { + _refreshIteration = 1; + } else { + _refreshIteration++; } - - private void logFailureMessage(RuntimeException ex) { - log.warnFormat( - "ResourceManager::refreshVdsRunTimeInfo::Failed to refresh VDS , vds = {0} : {1}, error = '{2}', continuing.", - _vds.getId(), - _vds.getvds_name(), - ExceptionUtils.getMessage(ex)); + if (isMonitoringNeeded()) { + setStartTime(); + _vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, _vds); + _vdsUpdater.Refresh(); + mUnrespondedAttempts.set(0); + setLastUpdate(); } - }); + if (!getInitialized() && getVds().getstatus() != VDSStatus.NonResponsive + && getVds().getstatus() != VDSStatus.PendingApproval) { + log.info("Initializing Host: " + getVds().getvds_name()); + ResourceManager.getInstance().HandleVdsFinishedInit(_vds.getId()); + setInitialized(true); + } + } catch (VDSNetworkException e) { + logNetworkException(e); + } catch (VDSRecoveringException ex) { + HandleVdsRecoveringException(ex); + } catch (IRSErrorException ex) { + logFailureMessage(ex); + if (log.isDebugEnabled()) { + logException(ex); + } + } catch (RuntimeException ex) { + logFailureMessage(ex); + logException(ex); + } try { if (_vdsUpdater != null) { _vdsUpdater.AfterRefreshTreatment(); - // Get vds data for updating domains list, ignoring vds which is down, since it's not connected to + // Get vds data for updating domains list, ignoring vds which is down, since it's not connected + // to // the storage anymore (so there is no sense in updating the domains list in that case). if (_vds != null && _vds.getstatus() != VDSStatus.Maintenance) { vdsId = _vds.getId(); @@ -287,12 +268,12 @@ _vds = null; _vdsUpdater = null; } catch (IRSErrorException ex) { - logFailureMessage(ex); + logAfterRefreshFailureMessage(ex); if (log.isDebugEnabled()) { logException(ex); } } catch (RuntimeException ex) { - logFailureMessage(ex); + logAfterRefreshFailureMessage(ex); logException(ex); } @@ -308,26 +289,33 @@ } } - public boolean isMonitoringNeeded() { - return ( monitoringStrategy.isMonitoringNeeded(_vds) && - _vds.getstatus() != VDSStatus.Installing && - _vds.getstatus() != VDSStatus.InstallFailed && - _vds.getstatus() != VDSStatus.Reboot && - _vds.getstatus() != VDSStatus.Maintenance && - _vds.getstatus() != VDSStatus.PendingApproval && - _vds.getstatus() != VDSStatus.Down ); + private void logFailureMessage(RuntimeException ex) { + log.warnFormat( + "VdsManager::refreshVdsRunTimeInfo::Failed to refresh VDS , vds = {0} : {1}, error = '{2}', continuing.", + _vds.getId(), + _vds.getvds_name(), + ExceptionUtils.getMessage(ex)); } private static void logException(final RuntimeException ex) { log.error("ResourceManager::refreshVdsRunTimeInfo", ex); } - private void logFailureMessage(RuntimeException ex) { + private void logAfterRefreshFailureMessage(RuntimeException ex) { log.warnFormat( "ResourceManager::refreshVdsRunTimeInfo::Failed to AfterRefreshTreatment VDS error = '{0}', continuing.", ExceptionUtils.getMessage(ex)); } + public boolean isMonitoringNeeded() { + return (monitoringStrategy.isMonitoringNeeded(_vds) && + _vds.getstatus() != VDSStatus.Installing && + _vds.getstatus() != VDSStatus.InstallFailed && + _vds.getstatus() != VDSStatus.Reboot && + _vds.getstatus() != VDSStatus.Maintenance && + _vds.getstatus() != VDSStatus.PendingApproval && _vds.getstatus() != VDSStatus.Down); + } + private void HandleVdsRecoveringException(VDSRecoveringException ex) { if (_vds.getstatus() != VDSStatus.Initializing && _vds.getstatus() != VDSStatus.NonOperational) { setStatus(VDSStatus.Initializing, _vds); -- To view, visit http://gerrit.ovirt.org/8231 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib79f8f8d5321de125efee17e5ae4083245885f32 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
