From cc6938e3a8bfa29d4aeccc7ce4218633f17b125a Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 10 Feb 2014 21:10:24 +0100 Subject: [PATCH] Findbugs : Fix several "of concern" findings. --- .../PremiumSecondaryStorageManagerImpl.java | 28 +++++++++---------- .../SecondaryStorageManagerImpl.java | 2 -- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java index af96ed2d751..15d58bed012 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java @@ -64,8 +64,8 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI HostDao _hostDao; @Inject ResourceManager _resourceMgr; - protected SearchBuilder ActiveCommandSearch; - protected SearchBuilder HostSearch; + protected SearchBuilder activeCommandSearch; + protected SearchBuilder hostSearch; @Override public boolean configure(String name, Map params) throws ConfigurationException { @@ -77,16 +77,16 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI int nMaxExecutionMinutes = NumbersUtil.parseInt(_configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30); _maxExecutionTimeMs = nMaxExecutionMinutes * 60 * 1000; - HostSearch = _hostDao.createSearchBuilder(); - HostSearch.and("dc", HostSearch.entity().getDataCenterId(), Op.EQ); - HostSearch.and("status", HostSearch.entity().getStatus(), Op.EQ); + hostSearch = _hostDao.createSearchBuilder(); + hostSearch.and("dc", hostSearch.entity().getDataCenterId(), Op.EQ); + hostSearch.and("status", hostSearch.entity().getStatus(), Op.EQ); - ActiveCommandSearch = _cmdExecLogDao.createSearchBuilder(); - ActiveCommandSearch.and("created", ActiveCommandSearch.entity().getCreated(), Op.GTEQ); - ActiveCommandSearch.join("hostSearch", HostSearch, ActiveCommandSearch.entity().getInstanceId(), HostSearch.entity().getId(), JoinType.INNER); + activeCommandSearch = _cmdExecLogDao.createSearchBuilder(); + activeCommandSearch.and("created", activeCommandSearch.entity().getCreated(), Op.GTEQ); + activeCommandSearch.join("hostSearch", hostSearch, activeCommandSearch.entity().getInstanceId(), hostSearch.entity().getId(), JoinType.INNER); - HostSearch.done(); - ActiveCommandSearch.done(); + hostSearch.done(); + activeCommandSearch.done(); return true; } @@ -112,12 +112,12 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI } List alreadyRunning = - _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, State.Starting); + _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, State.Starting); if (alreadyRunning.size() == 0) { s_logger.info("No running secondary storage vms found in datacenter id=" + dataCenterId + ", starting one"); List stopped = - _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Stopped, State.Stopping); + _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Stopped, State.Stopping); if (stopped.size() == 0 || !suspendAutoLoading) { List stopping = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, State.Stopping); if (stopping.size() > 0) { @@ -141,7 +141,7 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI List activeCmds = listActiveCommands(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"); + "), starting a new one"); return new Pair(AfterScanAction.expand, SecondaryStorageVm.Role.commandExecutor); } } @@ -166,7 +166,7 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI } private List listActiveCommands(long dcId, Date cutTime) { - SearchCriteria sc = ActiveCommandSearch.create(); + SearchCriteria sc = activeCommandSearch.create(); sc.setParameters("created", cutTime); sc.setJoinParameters("hostSearch", "dc", dcId); diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index 4a59d8f4682..6fc7eef92b0 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -123,7 +123,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.events.SubscriptionMgr; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.SecondaryStorageVm; @@ -371,7 +370,6 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar allowedCidrs.add(cidr); } } - List nics = _networkModel.getNicsForTraffic(secStorageVm.getId(), TrafficType.Management); setupCmd.setAllowedInternalSites(allowedCidrs.toArray(new String[allowedCidrs.size()])); } String copyPasswd = _configDao.getValue("secstorage.copy.password");