Roy Golan has uploaded a new change for review. Change subject: core: VdsManger - rename fields to fit convention ......................................................................
core: VdsManger - rename fields to fit convention Change-Id: I90e26c1a2db4d51f5bd13cf39a59593579fa7648 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 2 files changed, 85 insertions(+), 85 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/27378/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 c0c70fd..b9a6b65 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 @@ -55,43 +55,44 @@ public class VdsManager implements VdsManagerFacade { private static Log log = LogFactory.getLog(VdsManager.class); private static Map<Guid, String> recoveringJobIdMap = new ConcurrentHashMap<Guid, String>(); - private final int _numberRefreshesBeforeSave = Config.<Integer> getValue(ConfigValues.NumberVmRefreshesBeforeSave); - private final Object _lockObj = new Object(); + private final int numberRefreshesBeforeSave = Config.<Integer> getValue(ConfigValues.NumberVmRefreshesBeforeSave); + private final Object lockObj = new Object(); private final AtomicInteger mFailedToRunVmAttempts; private final AtomicInteger mUnrespondedAttempts; private final AtomicBoolean sshSoftFencingExecuted; - private final Guid _vdsId; + private final Guid vdsId; private final VdsMonitor vdsMonitor = new VdsMonitor(); - private VDS _vds; + private VDS vds; private long lastUpdate; private long updateStartTime; private long nextMaintenanceAttemptTime; private String onTimerJobId; - private int _refreshIteration = 1; + private int refreshIteration = 1; private boolean isSetNonOperationalExecuted; private MonitoringStrategy monitoringStrategy; private EngineLock monitoringLock; private String duringFailureJobId; private boolean privateInitialized; - private IVdsServer _vdsProxy; + private IVdsServer vdsProxy; private boolean mBeforeFirstRefresh = true; - private VdsUpdateRunTimeInfo _vdsUpdater; + private VdsUpdateRunTimeInfo vdsUpdater; private VdsManager(VDS vds) { log.info("Entered VdsManager constructor"); - _vds = vds; - _vdsId = vds.getId(); + this.vds = vds; + vdsId = vds.getId(); monitoringStrategy = MonitoringStrategyFactory.getMonitoringStrategyForVds(vds); mUnrespondedAttempts = new AtomicInteger(); mFailedToRunVmAttempts = new AtomicInteger(); sshSoftFencingExecuted = new AtomicBoolean(false); - monitoringLock = new EngineLock(Collections.singletonMap(_vdsId.toString(), + monitoringLock = new EngineLock(Collections.singletonMap(vdsId.toString(), new Pair<String, String>(LockingGroup.VDS_INIT.name(), "")), null); handlePreviousStatus(); handleSecureSetup(); InitVdsBroker(); - _vds = null; + this.vds = null; + } @Override @@ -99,22 +100,18 @@ // if ssl is on and no certificate file if (Config.<Boolean> getValue(ConfigValues.EncryptHostCommunication) && !EngineEncryptionUtils.haveKey()) { - if (_vds.getStatus() != VDSStatus.Maintenance && _vds.getStatus() != VDSStatus.InstallFailed) { - setStatus(VDSStatus.NonResponsive, _vds); - updateDynamicData(_vds.getDynamicData()); - } log.error("Could not find VDC Certificate file."); - AuditLogableBase logable = new AuditLogableBase(_vdsId); + AuditLogableBase logable = new AuditLogableBase(vdsId); AuditLogDirector.log(logable, AuditLogType.CERTIFICATE_FILE_NOT_FOUND); } } @Override public void handlePreviousStatus() { - if (_vds.getStatus() == VDSStatus.PreparingForMaintenance) { - _vds.setPreviousStatus(_vds.getStatus()); + if (vds.getStatus() == VDSStatus.PreparingForMaintenance) { + vds.setPreviousStatus(vds.getStatus()); } else { - _vds.setPreviousStatus(VDSStatus.Up); + vds.setPreviousStatus(VDSStatus.Up); } } @@ -128,7 +125,7 @@ SchedulerUtil sched = SchedulerUtilQuartzImpl.getInstance(); int timeout = Config.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes); int refreshRate = Config.<Integer> getValue(ConfigValues.VdsRefreshRate) * 1000; - + duringFailureJobId = sched.scheduleAFixedDelayJob( this, @@ -140,7 +137,7 @@ TimeUnit.MINUTES); sched.pauseJob(duringFailureJobId); // start with refresh statistics - _refreshIteration = _numberRefreshesBeforeSave - 1; + refreshIteration = numberRefreshesBeforeSave - 1; onTimerJobId = sched.scheduleAFixedDelayJob( @@ -154,8 +151,8 @@ } private void InitVdsBroker() { - log.infoFormat("Initialize vdsBroker ({0},{1})", _vds.getHostName(), _vds.getPort()); - _vdsProxy = new VdsServerWrapper(_vds.getHostName(), _vds.getPort()); + log.infoFormat("Initialize vdsBroker ({0},{1})", vds.getHostName(), vds.getPort()); + vdsProxy = new VdsServerWrapper(vds.getHostName(), vds.getPort()); } @Override @@ -172,31 +169,31 @@ ArrayList<VDSDomainsData> domainsList = null; VDS tmpVds; synchronized (getLockObj()) { - tmpVds = _vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); - if (_vds == null) { + tmpVds = 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; + if (refreshIteration == numberRefreshesBeforeSave) { + refreshIteration = 1; } else { - _refreshIteration++; + refreshIteration++; } if (isMonitoringNeeded()) { setStartTime(); - _vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, _vds, monitoringStrategy); - _vdsUpdater.refresh(); + vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, vds, monitoringStrategy); + vdsUpdater.refresh(); mUnrespondedAttempts.set(0); sshSoftFencingExecuted.set(false); setLastUpdate(); } - if (!getInitialized() && _vds.getStatus() != VDSStatus.NonResponsive - && _vds.getStatus() != VDSStatus.PendingApproval) { - log.infoFormat("Initializing Host: {0}", _vds.getName()); - ResourceManager.getInstance().HandleVdsFinishedInit(_vds.getId()); + if (!getInitialized() && vds.getStatus() != VDSStatus.NonResponsive + && vds.getStatus() != VDSStatus.PendingApproval) { + log.infoFormat("Initializing Host: {0}", vds.getName()); + ResourceManager.getInstance().HandleVdsFinishedInit(vds.getId()); setInitialized(true); } } catch (VDSNetworkException e) { @@ -207,21 +204,21 @@ logFailureMessage(ex); } try { - if (_vdsUpdater != null) { - _vdsUpdater.afterRefreshTreatment(); + if (vdsUpdater != null) { + vdsUpdater.afterRefreshTreatment(); // 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) { - storagePoolId = _vds.getStoragePoolId(); - domainsList = _vds.getDomains(); + if (vds != null && vds.getStatus() != VDSStatus.Maintenance) { + storagePoolId = vds.getStoragePoolId(); + domainsList = vds.getDomains(); } } - _vds = null; - _vdsUpdater = null; + vds = null; + vdsUpdater = null; } catch (IRSErrorException ex) { logAfterRefreshFailureMessage(ex); if (log.isDebugEnabled()) { @@ -250,8 +247,8 @@ private void logFailureMessage(RuntimeException ex) { log.warnFormat( "Failed to refresh VDS , vds = {0} : {1}, error = '{2}', continuing.", - _vds.getId(), - _vds.getName(), + vds.getId(), + vds.getName(), ex); } @@ -267,32 +264,32 @@ @Override 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); + 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); } @Override public void handleVdsRecoveringException(VDSRecoveringException ex) { - if (_vds.getStatus() != VDSStatus.Initializing && _vds.getStatus() != VDSStatus.NonOperational) { - setStatus(VDSStatus.Initializing, _vds); - DbFacade.getInstance().getVdsDynamicDao().updateStatus(_vds.getId(), VDSStatus.Initializing); - AuditLogableBase logable = new AuditLogableBase(_vds.getId()); + if (vds.getStatus() != VDSStatus.Initializing && vds.getStatus() != VDSStatus.NonOperational) { + setStatus(VDSStatus.Initializing, vds); + DbFacade.getInstance().getVdsDynamicDao().updateStatus(vds.getId(), VDSStatus.Initializing); + AuditLogableBase logable = new AuditLogableBase(vds.getId()); logable.addCustomValue("ErrorMessage", ex.getMessage()); logable.updateCallStackFromThrowable(ex); AuditLogDirector.log(logable, AuditLogType.VDS_INITIALIZING); log.warnFormat( "Failed to refresh VDS , vds = {0} : {1}, error = {2}, continuing.", - _vds.getId(), - _vds.getName(), + vds.getId(), + vds.getName(), ex.getMessage()); final int VDS_RECOVERY_TIMEOUT_IN_MINUTES = Config.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMintues); String jobId = SchedulerUtilQuartzImpl.getInstance().scheduleAOneTimeJob(this, "onTimerHandleVdsRecovering", new Class[0], new Object[0], VDS_RECOVERY_TIMEOUT_IN_MINUTES, TimeUnit.MINUTES); - recoveringJobIdMap.put(_vds.getId(), jobId); + recoveringJobIdMap.put(vds.getId(), jobId); } } @@ -364,24 +361,23 @@ } if (vds.getPreviousStatus() != vds.getStatus()) { vds.setPreviousStatus(vds.getStatus()); - if (_vds != null) { - _vds.setPreviousStatus(vds.getStatus()); - if (_vds.getStatus() == VDSStatus.PreparingForMaintenance) { + if (vds != null) { + vds.setPreviousStatus(vds.getStatus()); + if (vds.getStatus() == VDSStatus.PreparingForMaintenance) { calculateNextMaintenanceAttemptTime(); } - - } + } } // update to new status vds.setStatus(status); - if (_vds != null) { - _vds.setStatus(status); + if (this.vds != null) { + this.vds.setStatus(status); } switch (status) { case NonOperational: - if (_vds != null) { - _vds.setNonOperationalReason(vds.getNonOperationalReason()); + if (this.vds != null) { + this.vds.setNonOperationalReason(vds.getNonOperationalReason()); } if(vds.getVmCount() > 0) { break; @@ -396,14 +392,14 @@ vds.setUsageCpuPercent(0); vds.setUsageMemPercent(0); vds.setUsageNetworkPercent(0); - if (_vds != null) { - _vds.setCpuSys(Double.valueOf(0)); - _vds.setCpuUser(Double.valueOf(0)); - _vds.setCpuIdle(Double.valueOf(0)); - _vds.setCpuLoad(Double.valueOf(0)); - _vds.setUsageCpuPercent(0); - _vds.setUsageMemPercent(0); - _vds.setUsageNetworkPercent(0); + if (this.vds != null) { + this.vds.setCpuSys(Double.valueOf(0)); + this.vds.setCpuUser(Double.valueOf(0)); + this.vds.setCpuIdle(Double.valueOf(0)); + this.vds.setCpuLoad(Double.valueOf(0)); + this.vds.setUsageCpuPercent(0); + this.vds.setUsageMemPercent(0); + this.vds.setUsageNetworkPercent(0); } default: break; @@ -469,7 +465,7 @@ public void succededToRunVm(Guid vmId) { mUnrespondedAttempts.set(0); sshSoftFencingExecuted.set(false); - ResourceManager.getInstance().succededToRunVm(vmId, _vds.getId()); + ResourceManager.getInstance().succededToRunVm(vmId, vds.getId()); } @Override @@ -609,7 +605,7 @@ public void dispose() { log.info("vdsManager::disposing"); SchedulerUtilQuartzImpl.getInstance().deleteJob(onTimerJobId); - XmlRpcUtils.shutDownConnection(((VdsServerWrapper) _vdsProxy).getHttpClient()); + XmlRpcUtils.shutDownConnection(((VdsServerWrapper) vdsProxy).getHttpClient()); } /** @@ -620,21 +616,21 @@ */ @Override public void logNetworkException(VDSNetworkException e) { - switch (_vds.getStatus()) { + switch (vds.getStatus()) { case Down: break; case NonResponsive: log.debugFormat( "Failed to refresh VDS , vds = {0} : {1}, VDS Network Error, continuing.\n{2}", - _vds.getId(), - _vds.getName(), + vds.getId(), + vds.getName(), e.getMessage()); break; default: log.warnFormat( "Failed to refresh VDS , vds = {0} : {1}, VDS Network Error, continuing.\n{2}", - _vds.getId(), - _vds.getName(), + vds.getId(), + vds.getName(), e.getMessage()); } } @@ -703,11 +699,11 @@ } public IVdsServer getVdsProxy() { - return _vdsProxy; + return vdsProxy; } public Guid getVdsId() { - return _vdsId; + return vdsId; } public static void cancelRecoveryJob(Guid vdsId) { @@ -723,11 +719,11 @@ } public boolean getRefreshStatistics() { - return (_refreshIteration == _numberRefreshesBeforeSave); + return (refreshIteration == numberRefreshesBeforeSave); } public Object getLockObj() { - return _lockObj; + return lockObj; } public boolean getbeforeFirstRefresh() { @@ -737,4 +733,8 @@ public void setbeforeFirstRefresh(boolean value) { mBeforeFirstRefresh = value; } + + public VDS getVds() { + return vds; + } } 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 8c470a2..00eca2c 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 @@ -487,7 +487,7 @@ } } - private void refreshVdsRunTimeInfo() { + public void refreshVdsRunTimeInfo() { boolean isVdsUpOrGoingToMaintenance = _vds.getStatus() == VDSStatus.Up || _vds.getStatus() == VDSStatus.PreparingForMaintenance || _vds.getStatus() == VDSStatus.Error || _vds.getStatus() == VDSStatus.NonOperational; -- To view, visit http://gerrit.ovirt.org/27378 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90e26c1a2db4d51f5bd13cf39a59593579fa7648 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
