From 47140b9f5cc00e0c8dde79d86e60e79fff82317a Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Tue, 24 Apr 2018 11:26:45 +0200 Subject: [PATCH] CLOUDSTACK-10363: Change the "getXXX" and "listXXX" method names to "findXXX". These three methods are not direct getter or list. They try to find the target objects with the related arguments. So that, renaming them as "findXXX" should be more intuitive. --- .../framework/jobs/impl/AsyncJobManagerImpl.java | 4 ++-- .../com/cloud/network/ovs/OvsTunnelManagerImpl.java | 10 +++++----- .../com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java | 2 +- .../cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 2 +- .../PremiumSecondaryStorageManagerImpl.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 3ce96a677fb4..174f1f300cf4 100644 --- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -482,7 +482,7 @@ private AsyncJobDispatcher getDispatcher(String dispatcherName) { throw new CloudRuntimeException("Unable to find dispatcher name: " + dispatcherName); } - private AsyncJobDispatcher getWakeupDispatcher(AsyncJob job) { + private AsyncJobDispatcher findWakeupDispatcher(AsyncJob job) { if (_jobDispatchers != null) { List joinRecords = _joinMapDao.listJoinRecords(job.getId()); if (joinRecords.size() > 0) { @@ -567,7 +567,7 @@ protected void runInContext() { } if ((getAndResetPendingSignals(job) & AsyncJob.Constants.SIGNAL_MASK_WAKEUP) != 0) { - AsyncJobDispatcher jobDispatcher = getWakeupDispatcher(job); + AsyncJobDispatcher jobDispatcher = findWakeupDispatcher(job); if (jobDispatcher != null) { jobDispatcher.runJob(job); } else { diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java index cde4ee8a797c..aa7c0f6d1b26 100644 --- a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java +++ b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java @@ -212,7 +212,7 @@ private void handleCreateTunnelAnswer(Answer[] answers) { Long from = r.getFrom(); Long to = r.getTo(); long networkId = r.getNetworkId(); - OvsTunnelNetworkVO tunnel = _tunnelNetworkDao.getByFromToNetwork(from, to, networkId); + OvsTunnelNetworkVO tunnel = _tunnelNetworkDao.findByFromToNetwork(from, to, networkId); if (tunnel == null) { throw new CloudRuntimeException( String.format("Unable find tunnelNetwork record" + @@ -321,7 +321,7 @@ protected void checkAndCreateTunnel(Network nw, Host host) { if (rh == hostId) { continue; } - OvsTunnelNetworkVO ta = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), nw.getId()); + OvsTunnelNetworkVO ta = _tunnelNetworkDao.findByFromToNetwork(hostId, rh.longValue(), nw.getId()); // Try and create the tunnel even if a previous attempt failed if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) { s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue()); @@ -333,7 +333,7 @@ protected void checkAndCreateTunnel(Network nw, Host host) { } } - ta = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(), + ta = _tunnelNetworkDao.findByFromToNetwork(rh.longValue(), hostId, nw.getId()); // Try and create the tunnel even if a previous attempt failed if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) { @@ -605,7 +605,7 @@ protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) { if (rh == hostId) { continue; } - tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId()); + tunnelRecord = _tunnelNetworkDao.findByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId()); // Try and create the tunnel if does not exit or previous attempt failed if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) { s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue()); @@ -616,7 +616,7 @@ protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) { toHostIds.add(rh); } } - tunnelRecord = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(), hostId, vpcNetwork.getId()); + tunnelRecord = _tunnelNetworkDao.findByFromToNetwork(rh.longValue(), hostId, vpcNetwork.getId()); // Try and create the tunnel if does not exit or previous attempt failed if (tunnelRecord == null || tunnelRecord.getState().equals(OvsTunnel.State.Failed.name())) { s_logger.debug("Attempting to create tunnel from:" + rh.longValue() + " to:" + hostId); diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java index 1c7f4934d0e6..0aeb271c4231 100644 --- a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java +++ b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDao.java @@ -22,7 +22,7 @@ import com.cloud.utils.db.GenericDao; public interface OvsTunnelNetworkDao extends GenericDao { - OvsTunnelNetworkVO getByFromToNetwork(long from, long to, long networkId); + OvsTunnelNetworkVO findByFromToNetwork(long from, long to, long networkId); void removeByFromNetwork(long from, long networkId); diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java index 5e314f0fd693..6d12c1938d00 100644 --- a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java +++ b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java @@ -53,7 +53,7 @@ public OvsTunnelNetworkDaoImpl() { } @Override - public OvsTunnelNetworkVO getByFromToNetwork(long from, long to, long networkId) { + public OvsTunnelNetworkVO findByFromToNetwork(long from, long to, long networkId) { SearchCriteria sc = fromToNetworkSearch.create(); sc.setParameters("from", from); sc.setParameters("to", to); diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java index 357c55e5bf16..ecfc67eaff6d 100644 --- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java @@ -136,7 +136,7 @@ public Pair scanPool(Long pool) { alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(null, dataCenterId, State.Running, State.Migrating, State.Starting); - List activeCmds = listActiveCommands(dataCenterId, cutTime); + List activeCmds = findActiveCommands(dataCenterId, cutTime); if (alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() < _standbyCapacity) { s_logger.info("secondary storage command execution standby capactiy low (running VMs: " + alreadyRunning.size() + ", active cmds: " + activeCmds.size() + "), starting a new one"); @@ -163,7 +163,7 @@ public Pair assignSecStorageVm(long zoneId, Comman return null; } - private List listActiveCommands(long dcId, Date cutTime) { + private List findActiveCommands(long dcId, Date cutTime) { SearchCriteria sc = activeCommandSearch.create(); sc.setParameters("created", cutTime);