Roy Golan has uploaded a new change for review. Change subject: core: VdsManager - no need to cache config values ......................................................................
core: VdsManager - no need to cache config values Change-Id: Icfb5a1641038742dd848ee67cb0fe53ce16b7909 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/VdsManagerFacade.java 2 files changed, 33 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/27375/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 1cbe9e1..b783807 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 @@ -10,7 +10,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.httpclient.HttpClient; import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; @@ -50,7 +49,6 @@ import org.ovirt.engine.core.vdsbroker.vdsbroker.IVdsServer; import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSNetworkException; import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSRecoveringException; -import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsServerConnector; import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsServerWrapper; import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcUtils; @@ -68,14 +66,12 @@ private long lastUpdate; private long updateStartTime; private long nextMaintenanceAttemptTime; - private int VDS_REFRESH_RATE = Config.<Integer> getValue(ConfigValues.VdsRefreshRate) * 1000; private String onTimerJobId; private int _refreshIteration = 1; private boolean isSetNonOperationalExecuted; private MonitoringStrategy monitoringStrategy; private EngineLock monitoringLock; - private int VDS_DURING_FAILURE_TIMEOUT_IN_MINUTES = Config - .<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes); + private String duringFailureJobId; private boolean privateInitialized; private IVdsServer _vdsProxy; private boolean mBeforeFirstRefresh = true; @@ -130,11 +126,31 @@ @Override public void schedulJobs() { SchedulerUtil sched = SchedulerUtilQuartzImpl.getInstance(); + int timeout = Config.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes); + int refreshRate = Config.<Integer> getValue(ConfigValues.VdsRefreshRate) * 1000; + + duringFailureJobId = + sched.scheduleAFixedDelayJob( + this, + "onVdsDuringFailureTimer", + new Class[0], + new Object[0], + timeout, + timeout, + TimeUnit.MINUTES); + sched.pauseJob(duringFailureJobId); // start with refresh statistics _refreshIteration = _numberRefreshesBeforeSave - 1; - onTimerJobId = sched.scheduleAFixedDelayJob(this, "onTimer", new Class[0], new Object[0], VDS_REFRESH_RATE, - VDS_REFRESH_RATE, TimeUnit.MILLISECONDS); + onTimerJobId = + sched.scheduleAFixedDelayJob( + this, + "onTimer", + new Class[0], + new Object[0], + refreshRate, + refreshRate, + TimeUnit.MILLISECONDS); } private void InitVdsBroker() { @@ -323,24 +339,6 @@ DbFacade.getInstance().getVdsStatisticsDao().update(statisticsData); } -<<<<<<< HEAD -======= - @Override - public VDS activate() { - VDS vds = null; - try { - vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); - refreshHost(vds); - } catch (Exception e) { - log.infoFormat("Failed to activate VDS = {0} with error: {1}.", - getVdsId(), e.getMessage()); - } - - return vds; - } - - @Override ->>>>>>> core: VdsManager - cleanup public void refreshHost(VDS vds) { try { refreshCapabilities(new AtomicBoolean(), vds); @@ -449,13 +447,17 @@ new SetVdsStatusVDSCommandParameters(vds.getId(), VDSStatus.Error)); SchedulerUtil sched = SchedulerUtilQuartzImpl.getInstance(); - sched.scheduleAOneTimeJob(this, "recoverFromError", new Class[0], - new Object[0], VDS_DURING_FAILURE_TIMEOUT_IN_MINUTES, + sched.scheduleAOneTimeJob( + this, + "recoverFromError", + new Class[0], + new Object[0], + Config.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes), TimeUnit.MINUTES); - AuditLogableBase logable = new AuditLogableBase(vds.getId()); - logable.addCustomValue("Time", Config.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes) - .toString()); - AuditLogDirector.log(logable, AuditLogType.VDS_FAILED_TO_RUN_VMS); + AuditLogDirector.log( + new AuditLogableBase(vds.getId()) + .addCustomValue("Time", Config.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes).toString()), + AuditLogType.VDS_FAILED_TO_RUN_VMS); log.infoFormat("Vds {0} moved to Error mode after {1} attempts. Time: {2}", vds.getName(), mFailedToRunVmAttempts, new Date()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java index a9adf56..fc08f89 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java @@ -9,9 +9,6 @@ import java.util.concurrent.atomic.AtomicBoolean; -/** - * Created by rgolan on 4/2/14. - */ public interface VdsManagerFacade { void handleSecureSetup(); @@ -26,8 +23,6 @@ void updateDynamicData(VdsDynamic dynamicData); void updateStatisticsData(VdsStatistics statisticsData); - - VDS activate(); void refreshHost(VDS vds); -- To view, visit http://gerrit.ovirt.org/27375 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfb5a1641038742dd848ee67cb0fe53ce16b7909 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
