Alissa Bonas has uploaded a new change for review. Change subject: core: fix methods in IrsBrokerCommand to lowercase ......................................................................
core: fix methods in IrsBrokerCommand to lowercase Change-Id: Ice0db54b1fece642cc5fee395e0652b55b34ced7 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java 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/irsbroker/DestroyStoragePoolVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java 6 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/20824/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index b35ce48..cda55b5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -88,7 +88,7 @@ for (VDS curVds : allVdsList) { AddVds(curVds, true); } - IrsBrokerCommand.Init(); + IrsBrokerCommand.init(); log.info("Finished initializing " + getClass().getSimpleName()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java index b4b9ec2..f1d7ebe 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java @@ -36,7 +36,7 @@ }); if (vds.getSpmStatus() != VdsSpmStatus.None && parameters.getStatus() != VDSStatus.Up) { - log.infoFormat("VDS {0} is spm and moved from up calling ResetIrs.", vds.getName()); + log.infoFormat("VDS {0} is spm and moved from up calling resetIrs.", vds.getName()); // check if this host was spm and reset if do. getVDSReturnValue().setSucceeded( ResourceManager 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 e076896..c0c0314 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 @@ -281,7 +281,7 @@ // Now update the status of domains, this code should not be in // synchronized part of code if (domainsList != null) { - IrsBrokerCommand.UpdateVdsDomainsData(tmpVds, storagePoolId, domainsList); + IrsBrokerCommand.updateVdsDomainsData(tmpVds, storagePoolId, domainsList); } } catch (Exception e) { log.error("Timer update runtimeinfo failed. Exception:", e); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DestroyStoragePoolVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DestroyStoragePoolVDSCommand.java index c15b088..51f289d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DestroyStoragePoolVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DestroyStoragePoolVDSCommand.java @@ -15,6 +15,6 @@ status = getIrsProxy().destroyStoragePool(getParameters().getStoragePoolId().toString(), vds.getVdsSpmId(), getParameters().getStoragePoolId().toString()); proceedProxyReturnValue(); - RemoveIrsProxy(); + removeIrsProxy(); } } 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 27d0bda..de5cae0 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 @@ -94,12 +94,12 @@ * @param storagePoolId * @param vdsDomainData */ - public static void UpdateVdsDomainsData(VDS vds, Guid storagePoolId, - ArrayList<VDSDomainsData> vdsDomainData) { + public static void updateVdsDomainsData(VDS vds, Guid storagePoolId, + ArrayList<VDSDomainsData> vdsDomainData) { if (vds.getStatus() == VDSStatus.Up) { IrsProxyData proxy = _irsProxyData.get(storagePoolId); if (proxy != null) { - proxy.UpdateVdsDomainsData(vds.getId(), vds.getName(), vdsDomainData); + proxy.updateVdsDomainsData(vds.getId(), vds.getName(), vdsDomainData); } } } @@ -117,7 +117,7 @@ return new IRSErrorException(errorMessage); } - public static void Init() { + public static void init() { for (StoragePool sp : DbFacade.getInstance().getStoragePoolDao().getAll()) { if (!_irsProxyData.containsKey(sp.getId())) { _irsProxyData.put(sp.getId(), new IrsProxyData(sp.getId())); @@ -125,8 +125,8 @@ } } - public void RemoveIrsProxy() { - _irsProxyData.get(getParameters().getStoragePoolId()).Dispose(); + public void removeIrsProxy() { + _irsProxyData.get(getParameters().getStoragePoolId()).dispose(); _irsProxyData.remove(getParameters().getStoragePoolId()); } @@ -984,7 +984,7 @@ return String.format("\\\\%1$s\\CD", ((tempVar != null) ? tempVar : gethostFromVds())); } - public void ResetIrs() { + public void resetIrs() { nullifyInternalProxies(); StoragePool storagePool = DbFacade.getInstance().getStoragePoolDao().get(_storagePoolId); if (storagePool != null) { @@ -1005,8 +1005,8 @@ private final Map<Guid, HashSet<Guid>> _domainsInProblem = new ConcurrentHashMap<Guid, HashSet<Guid>>(); private final Map<Guid, String> _timers = new HashMap<Guid, String>(); - public void UpdateVdsDomainsData(final Guid vdsId, final String vdsName, - final ArrayList<VDSDomainsData> data) { + public void updateVdsDomainsData(final Guid vdsId, final String vdsName, + final ArrayList<VDSDomainsData> data) { Set<Guid> domainsInProblems = null; StoragePool storagePool = @@ -1077,7 +1077,7 @@ domainsInProblems.addAll(domainsSeenByVdsInProblem); } catch (RuntimeException ex) { - log.error("error in UpdateVdsDomainsData", ex); + log.error("error in updateVdsDomainsData", ex); } } @@ -1165,10 +1165,10 @@ for (Guid domainId : domainsInProblems) { if (domainsInProblemKeySet.contains(domainId)) { // existing domains in problem - UpdateDomainInProblemData(domainId, vdsId, vdsName); + updateDomainInProblemData(domainId, vdsId, vdsName); } else { // new domains in problems - AddDomainInProblemData(domainId, vdsId, vdsName); + addDomainInProblemData(domainId, vdsId, vdsName); } } Set<Guid> notReportedDomainsByHost = new HashSet<Guid>(_domainsInProblem.keySet()); @@ -1193,7 +1193,7 @@ } } - private void AddDomainInProblemData(Guid domainId, Guid vdsId, String vdsName) { + private void addDomainInProblemData(Guid domainId, Guid vdsId, String vdsName) { _domainsInProblem.put(domainId, new java.util.HashSet<Guid>(java.util.Arrays.asList(vdsId))); log.warnFormat("domain {0} in problem. vds: {1}", getDomainIdTuple(domainId), vdsName); Class[] inputType = new Class[] { Guid.class }; @@ -1214,8 +1214,8 @@ public EventResult call() { EventResult result = null; if (_domainsInProblem.containsKey(domainId)) { - log.info("starting ProcessDomainRecovery for domain " + getDomainIdTuple(domainId)); - result = ProcessDomainRecovery(domainId); + log.info("starting processDomainRecovery for domain " + getDomainIdTuple(domainId)); + result = processDomainRecovery(domainId); } _timers.remove(domainId); return result; @@ -1223,12 +1223,12 @@ }); } - private void UpdateDomainInProblemData(Guid domainId, Guid vdsId, String vdsName) { + private void updateDomainInProblemData(Guid domainId, Guid vdsId, String vdsName) { log.debugFormat("domain {0} still in problem. vds: {1}", getDomainIdTuple(domainId), vdsName); _domainsInProblem.get(domainId).add(vdsId); } - private EventResult ProcessDomainRecovery(final Guid domainId) { + private EventResult processDomainRecovery(final Guid domainId) { EventResult result = null; // build a list of all the hosts in status UP in // Pool. @@ -1416,10 +1416,10 @@ private boolean _disposed; - public void Dispose() { + public void dispose() { synchronized (syncObj) { log.info("IrsProxyData::disposing"); - ResetIrs(); + resetIrs(); SchedulerUtilQuartzImpl.getInstance().deleteJob(storagePoolRefreshJobId); _disposed = true; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java index 9aeacc2..0eb32ec 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java @@ -28,7 +28,7 @@ if (getParameters().getPreferredSPMId() != null) { getCurrentIrsProxyData().setPreferredHostId(getParameters().getPreferredSPMId()); } - getCurrentIrsProxyData().ResetIrs(); + getCurrentIrsProxyData().resetIrs(); StoragePool pool = DbFacade.getInstance().getStoragePoolDao().get(parameters.getStoragePoolId()); if (pool != null && (pool.getStatus() == StoragePoolStatus.NotOperational)) { ResourceManager -- To view, visit http://gerrit.ovirt.org/20824 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice0db54b1fece642cc5fee395e0652b55b34ced7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
