Skip to content

StorageManager tech debt: remove unused methods, fields and return values #13598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaanHoogland wants to merge 1 commit into from
+2 −217
Open

StorageManager tech debt: remove unused methods, fields and return values #13598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,6 @@ static Boolean getFullCloneConfiguration(Long storeId) {

boolean canPoolProvideStorageStats(StoragePool pool);

boolean poolProvidesCustomStorageStats(StoragePool pool);

Map<String, String> getCustomStorageStats(StoragePool pool);

/**
* Checks if a host has running VMs that are using its local storage pool.
* @return true if local storage is active on the host
Expand All @@ -312,8 +308,6 @@ static Boolean getFullCloneConfiguration(Long storeId) {
*/
void cleanupStorage(boolean recurring);

String getPrimaryStorageNameLabel(VolumeVO volume);

void createCapacityEntry(StoragePoolVO storagePool, short capacityType, long allocated);

Answer sendToPool(StoragePool pool, long[] hostIdsToTryFirst, Command cmd) throws StorageUnavailableException;
Expand All @@ -326,8 +320,6 @@ static Boolean getFullCloneConfiguration(Long storeId) {

CapacityVO getStoragePoolUsedStats(Long zoneId, Long podId, Long clusterId, List<Long> poolIds);

List<StoragePoolVO> ListByDataCenterHypervisor(long datacenterId, HypervisorType type);

List<VMInstanceVO> listByStoragePool(long storagePoolId);

StoragePoolVO findLocalStorageOnHost(long hostId);
Expand All @@ -340,11 +332,9 @@ static Boolean getFullCloneConfiguration(Long storeId) {

boolean canHostPrepareStoragePoolAccess(Host host, StoragePool pool);

boolean canDisconnectHostFromStoragePool(Host host, StoragePool pool);

Host getHost(long hostId);

Host updateSecondaryStorage(long secStorageId, String newUrl);
void updateSecondaryStorage(long secStorageId, String newUrl);
Comment thread
DaanHoogland marked this conversation as resolved.
Resolved

void removeStoragePoolFromCluster(long hostId, String iScsiName, StoragePool storagePool);

Expand Down
207 changes: 1 addition & 206 deletions server/src/main/java/com/cloud/storage/StorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import java.net.URLDecoder;
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -220,11 +218,9 @@
import com.cloud.org.Grouping.AllocationState;
import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceState;
import com.cloud.server.ConfigurationServer;
import com.cloud.server.ManagementServer;
import com.cloud.server.ManagementService;
import com.cloud.server.StatsCollector;
import com.cloud.service.dao.ServiceOfferingDetailsDao;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.Volume.Type;
Expand Down Expand Up @@ -358,8 +354,6 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
@Inject
SnapshotDataFactory snapshotFactory;
@Inject
ConfigurationServer _configServer;
@Inject
DataStoreManager _dataStoreMgr;
@Inject
DataStoreProviderManager _dataStoreProviderMgr;
Expand All @@ -376,8 +370,6 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
@Inject
SnapshotService _snapshotService;
@Inject
public StorageService storageService;
@Inject
StoragePoolTagsDao _storagePoolTagsDao;
@Inject
StoragePoolAndAccessGroupMapDao _storagePoolAccessGroupMapDao;
Expand All @@ -386,8 +378,6 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
@Inject
DiskOfferingDetailsDao _diskOfferingDetailsDao;
@Inject
ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
@Inject
VsphereStoragePolicyDao _vsphereStoragePolicyDao;
@Inject
private AnnotationDao annotationDao;
Expand Down Expand Up @@ -416,22 +406,10 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
@Inject
ResourceManager _resourceMgr;
@Inject
StorageManager storageManager;
@Inject
ManagementService managementService;
@Inject
JsInterpreterHelper jsInterpreterHelper;

protected List<StoragePoolDiscoverer> _discoverers;

public List<StoragePoolDiscoverer> getDiscoverers() {
return _discoverers;
}

public void setDiscoverers(List<StoragePoolDiscoverer> discoverers) {
_discoverers = discoverers;
}

protected GenericSearchBuilder<StoragePoolHostVO, Long> UpHostsInPoolSearch;
protected SearchBuilder<VMInstanceVO> StoragePoolSearch;
protected SearchBuilder<StoragePoolVO> LocalStorageSearch;
Expand All @@ -449,44 +427,6 @@ public void setDiscoverers(List<StoragePoolDiscoverer> discoverers) {

private static final String NFS_MOUNT_OPTIONS_INCORRECT = "An incorrect mount option was specified";

public boolean share(VMInstanceVO vm, List<VolumeVO> vols, HostVO host, boolean cancelPreviousShare) throws StorageUnavailableException {

// if pool is in maintenance and it is the ONLY pool available; reject
List<VolumeVO> rootVolForGivenVm = volumeDao.findByInstanceAndType(vm.getId(), Type.ROOT);
if (rootVolForGivenVm != null && rootVolForGivenVm.size() > 0) {
boolean isPoolAvailable = isPoolAvailable(rootVolForGivenVm.get(0).getPoolId());
if (!isPoolAvailable) {
throw new StorageUnavailableException("Can not share " + vm, rootVolForGivenVm.get(0).getPoolId());
}
}

// this check is done for maintenance mode for primary storage
// if any one of the volume is unusable, we return false
// if we return false, the allocator will try to switch to another PS if
// available
for (VolumeVO vol : vols) {
if (vol.getRemoved() != null) {
logger.warn("Volume: {} is removed, cannot share on this instance: {}", vol, vm);
// not ok to share
return false;
}
}
// ok to share
return true;
}

private boolean isPoolAvailable(Long poolId) {
// get list of all pools
List<StoragePoolVO> pools = _storagePoolDao.listAll();

// if no pools or 1 pool which is in maintenance
if (pools == null || pools.size() == 0 || (pools.size() == 1 && pools.get(0).getStatus().equals(StoragePoolStatus.Maintenance))) {
return false;
} else {
return true;
}
}

protected void enableDefaultDatastoreDownloadRedirectionForExistingInstallations() {
if (!configDepot.isNewConfig(DataStoreDownloadFollowRedirects)) {
logger.trace("{} is not a new configuration, skipping updating its value",
Expand All @@ -502,29 +442,6 @@ protected void enableDefaultDatastoreDownloadRedirectionForExistingInstallations
}
}

@Override
public List<StoragePoolVO> ListByDataCenterHypervisor(long datacenterId, HypervisorType type) {
List<StoragePoolVO> pools = _storagePoolDao.listByDataCenterId(datacenterId);
List<StoragePoolVO> retPools = new ArrayList<>();
for (StoragePoolVO pool : pools) {
if (pool.getStatus() != StoragePoolStatus.Up) {
continue;
}
if (pool.getScope() == ScopeType.ZONE) {
if (pool.getHypervisor() != null && pool.getHypervisor() == type) {
retPools.add(pool);
}
} else {
ClusterVO cluster = _clusterDao.findById(pool.getClusterId());
if (type == cluster.getHypervisorType()) {
retPools.add(pool);
}
}
}
Collections.shuffle(retPools);
return retPools;
}

@Override
public boolean isLocalStorageActiveOnHost(Long hostId) {
List<StoragePoolHostVO> storagePoolHostRefs = _storagePoolHostDao.listByHostId(hostId);
Expand Down Expand Up @@ -615,31 +532,6 @@ public boolean canPoolProvideStorageStats(StoragePool pool) {
return storeDriver instanceof PrimaryDataStoreDriver && ((PrimaryDataStoreDriver)storeDriver).canProvideStorageStats();
}

@Override
public boolean poolProvidesCustomStorageStats(StoragePool pool) {
DataStoreProvider storeProvider = _dataStoreProviderMgr.getDataStoreProvider(pool.getStorageProviderName());
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
return storeDriver instanceof PrimaryDataStoreDriver && ((PrimaryDataStoreDriver)storeDriver).poolProvidesCustomStorageStats();
}

@Override
public Map<String, String> getCustomStorageStats(StoragePool pool) {
if (pool == null) {
return null;
}

if (!pool.isManaged()) {
return null;
}

DataStoreProvider storeProvider = _dataStoreProviderMgr.getDataStoreProvider(pool.getStorageProviderName());
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
if (storeDriver instanceof PrimaryDataStoreDriver) {
return ((PrimaryDataStoreDriver)storeDriver).getCustomStorageStats(pool);
}
return null;
}

@Override
public Answer getVolumeStats(StoragePool pool, Command cmd) {
DataStoreProvider storeProvider = _dataStoreProviderMgr.getDataStoreProvider(pool.getStorageProviderName());
Expand All @@ -661,35 +553,6 @@ public Answer getVolumeStats(StoragePool pool, Command cmd) {
return new GetVolumeStatsAnswer(getVolumeStatsCommand, "", statEntry);
}

public Long chooseHostForStoragePool(StoragePoolVO poolVO, List<Long> avoidHosts, boolean sendToVmResidesOn, Long vmId) {
if (sendToVmResidesOn) {
if (vmId != null) {
VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId);
if (vmInstance != null) {
Long hostId = vmInstance.getHostId();
if (hostId != null && !avoidHosts.contains(vmInstance.getHostId())) {
return hostId;
}
}
}
/*
* Can't find the vm where host resides on(vm is destroyed? or
* volume is detached from vm), randomly choose a host to send the
* cmd
*/
}
List<StoragePoolHostVO> poolHosts = _storagePoolHostDao.listByHostStatus(poolVO.getId(), Status.Up);
Collections.shuffle(poolHosts);
if (poolHosts != null && poolHosts.size() > 0) {
for (StoragePoolHostVO sphvo : poolHosts) {
if (!avoidHosts.contains(sphvo.getHostId())) {
return sphvo.getHostId();
}
}
}
return null;
}

@Override
public boolean configure(String name, Map<String, Object> params) {
Map<String, String> configs = _configDao.getConfiguration("management-server", params);
Expand Down Expand Up @@ -2415,48 +2278,6 @@ private void handleManagedStorage(Volume volume) {
}
}

@DB
List<Long> findAllVolumeIdInSnapshotTable(Long storeId) {
String sql = "SELECT volume_id from snapshots, snapshot_store_ref WHERE snapshots.id = snapshot_store_ref.snapshot_id and store_id=? GROUP BY volume_id";
List<Long> list = new ArrayList<>();
try {
TransactionLegacy txn = TransactionLegacy.currentTxn();
ResultSet rs = null;
PreparedStatement pstmt = null;
pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setLong(1, storeId);
rs = pstmt.executeQuery();
while (rs.next()) {
list.add(rs.getLong(1));
}
return list;
} catch (Exception e) {
logger.debug("failed to get all volumes who has snapshots in secondary storage " + storeId + " due to " + e.getMessage());
return null;
}

}

List<String> findAllSnapshotForVolume(Long volumeId) {
String sql = "SELECT backup_snap_id FROM snapshots WHERE volume_id=? and backup_snap_id is not NULL";
try {
TransactionLegacy txn = TransactionLegacy.currentTxn();
ResultSet rs = null;
PreparedStatement pstmt = null;
pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setLong(1, volumeId);
rs = pstmt.executeQuery();
List<String> list = new ArrayList<>();
while (rs.next()) {
list.add(rs.getString(1));
}
return list;
} catch (Exception e) {
logger.debug("failed to get all snapshots for a volume " + volumeId + " due to " + e.getMessage());
return null;
}
}

@Override
@DB
public void cleanupSecondaryStorage(boolean recurring) {
Expand Down Expand Up @@ -2540,18 +2361,6 @@ public void cleanupSecondaryStorage(boolean recurring) {
}
}

@Override
public String getPrimaryStorageNameLabel(VolumeVO volume) {
Long poolId = volume.getPoolId();

// poolId is null only if volume is destroyed, which has been checked
// before.
assert poolId != null;
StoragePoolVO primaryDataStoreVO = _storagePoolDao.findById(poolId);
assert primaryDataStoreVO != null;
return primaryDataStoreVO.getUuid();
}

@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE,
Expand Down Expand Up @@ -2986,8 +2795,6 @@ public Pair<Boolean, String> checkIfReadyVolumeFitsInStoragePoolWithStorageAcces
}

if (CollectionUtils.isNotEmpty(srcStorageAccessGroups) && CollectionUtils.isNotEmpty(destStorageAccessGroups)) {
List<String> intersection = new ArrayList<>(srcStorageAccessGroups);
intersection.retainAll(destStorageAccessGroups);

if (ArrayUtils.isNotEmpty(hostStorageAccessGroups)) {
boolean hasSrcCommon = srcStorageAccessGroups.stream()
Expand Down Expand Up @@ -3363,25 +3170,14 @@ public boolean canHostPrepareStoragePoolAccess(Host host, StoragePool pool) {
return storeDriver instanceof PrimaryDataStoreDriver && ((PrimaryDataStoreDriver)storeDriver).canHostPrepareStoragePoolAccess(host, pool);
}

@Override
public boolean canDisconnectHostFromStoragePool(Host host, StoragePool pool) {
if (pool == null || !pool.isManaged()) {
return true;
}

DataStoreProvider storeProvider = _dataStoreProviderMgr.getDataStoreProvider(pool.getStorageProviderName());
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
return storeDriver instanceof PrimaryDataStoreDriver && ((PrimaryDataStoreDriver)storeDriver).canDisconnectHostFromStoragePool(host, pool);
}

@Override
@DB
public Host getHost(long hostId) {
return _hostDao.findById(hostId);
}

@Override
public Host updateSecondaryStorage(long secStorageId, String newUrl) {
public void updateSecondaryStorage(long secStorageId, String newUrl) {
HostVO secHost = _hostDao.findById(secStorageId);
if (secHost == null) {
throw new InvalidParameterValueException("Can not find out the secondary storage id: " + secStorageId);
Expand Down Expand Up @@ -3428,7 +3224,6 @@ public Host updateSecondaryStorage(long secStorageId, String newUrl) {
secHost.setGuid(newUrl);
secHost.setName(newUrl);
_hostDao.update(secHost.getId(), secHost);
return secHost;
}

@Override
Expand Down
Loading