Skip to content

kvm: support multiple local storage pools #6147

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

Merged
nvazquez merged 5 commits into from
Mar 25, 2022
Merged

kvm: support multiple local storage pools #6147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4cdd72
kvm: support multiple local storage pools
weizhouapache Mar 21, 2022
8178d33
Update #6147: add method configureLocalStorage
weizhouapache Mar 21, 2022
e58b673
Update #6147: add method validateLocalStorageUUID
weizhouapache Mar 21, 2022
c9b6286
Update #6147: remove underscore
weizhouapache Mar 23, 2022
a4e6c27
Update #6147: add unit tests
weizhouapache Mar 24, 2022
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
93 changes: 70 additions & 23 deletions ...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@
public class LibvirtComputingResource extends ServerResourceBase implements ServerResource, VirtualRouterDeployer {
private static final Logger s_logger = Logger.getLogger(LibvirtComputingResource.class);

private static final String CONFIG_VALUES_SEPARATOR = ",";

private static final String LEGACY = "legacy";
private static final String SECURE = "secure";

Expand Down Expand Up @@ -347,8 +349,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
protected String _pool;
protected String _localGateway;
private boolean _canBridgeFirewall;
protected String _localStoragePath;
protected String _localStorageUUID;
protected boolean _noMemBalloon = false;
protected String _guestCpuArch;
protected String _guestCpuMode;
Expand Down Expand Up @@ -382,6 +382,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
protected String _agentHooksVmOnStopScript = "libvirt-vm-state-change.groovy";
protected String _agentHooksVmOnStopMethod = "onStop";

protected static final String LOCAL_STORAGE_PATH = "local.storage.path";
protected static final String LOCAL_STORAGE_UUID = "local.storage.uuid";
protected static final String DEFAULT_LOCAL_STORAGE_PATH = "/var/lib/libvirt/images/";

protected List<String> localStoragePaths = new ArrayList<>();
protected List<String> localStorageUUIDs = new ArrayList<>();

private static final String CONFIG_DRIVE_ISO_DISK_LABEL = "hdd";
private static final int CONFIG_DRIVE_ISO_DEVICE_ID = 4;

Expand Down Expand Up @@ -1004,10 +1011,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
}
}

_localStoragePath = (String)params.get("local.storage.path");
if (_localStoragePath == null) {
_localStoragePath = "/var/lib/libvirt/images/";
}
configureLocalStorage(params);

/* Directory to use for Qemu sockets like for the Qemu Guest Agent */
_qemuSocketsPath = new File("/var/lib/libvirt/qemu");
Expand All @@ -1016,14 +1020,6 @@ public boolean configure(final String name, final Map<String, Object> params) th
_qemuSocketsPath = new File(_qemuSocketsPathVar);
}

final File storagePath = new File(_localStoragePath);
_localStoragePath = storagePath.getAbsolutePath();

_localStorageUUID = (String)params.get("local.storage.uuid");
if (_localStorageUUID == null) {
_localStorageUUID = UUID.randomUUID().toString();
}

value = (String)params.get("scripts.timeout");
_timeout = Duration.standardSeconds(NumbersUtil.parseInt(value, 30 * 60));

Expand Down Expand Up @@ -1288,6 +1284,43 @@ public boolean configure(final String name, final Map<String, Object> params) th
return true;
}

protected void configureLocalStorage(final Map<String, Object> params) throws ConfigurationException {
String localStoragePath = (String)params.get(LOCAL_STORAGE_PATH);
if (localStoragePath == null) {
localStoragePath = DEFAULT_LOCAL_STORAGE_PATH;
}
String localStorageUUIDString = (String)params.get(LOCAL_STORAGE_UUID);
if (localStorageUUIDString == null) {
localStorageUUIDString = UUID.randomUUID().toString();
}

String[] localStorageRelativePaths = localStoragePath.split(CONFIG_VALUES_SEPARATOR);
String[] localStorageUUIDStrings = localStorageUUIDString.split(CONFIG_VALUES_SEPARATOR);
if (localStorageRelativePaths.length != localStorageUUIDStrings.length) {
throw new ConfigurationException("The path and UUID of local storage pools have different length");
}
for (String localStorageRelativePath : localStorageRelativePaths) {
final File storagePath = new File(localStorageRelativePath);
localStoragePaths.add(storagePath.getAbsolutePath());
}

for (String localStorageUUID : localStorageUUIDStrings) {
validateLocalStorageUUID(localStorageUUID);
localStorageUUIDs.add(localStorageUUID);
}
}

private void validateLocalStorageUUID(String localStorageUUID) throws ConfigurationException {
if (StringUtils.isBlank(localStorageUUID)) {
throw new ConfigurationException("The UUID of local storage pools must be non-blank");
}
try {
UUID.fromString(localStorageUUID);
} catch (IllegalArgumentException ex) {
throw new ConfigurationException("The UUID of local storage pool is invalid : " + localStorageUUID);
}
}

public boolean configureHostParams(final Map<String, String> params) {
final File file = PropertiesUtil.findConfigFile("agent.properties");
if (file == null) {
Expand Down Expand Up @@ -3285,12 +3318,31 @@ public StartupCommand[] initialize() {
_hostDistro = cmd.getHostDetails().get("Host.OS");
}

List<StartupCommand> startupCommands = new ArrayList<>();
startupCommands.add(cmd);
for (int i = 0; i < localStoragePaths.size(); i++) {
String localStoragePath = localStoragePaths.get(i);
String localStorageUUID = localStorageUUIDs.get(i);
StartupStorageCommand sscmd = createLocalStoragePool(localStoragePath, localStorageUUID, cmd);
if (sscmd != null) {
startupCommands.add(sscmd);
}
}
StartupCommand[] startupCommandsArray = new StartupCommand[startupCommands.size()];
int i = 0;
for (StartupCommand startupCommand : startupCommands) {
startupCommandsArray[i] = startupCommand;
i++;
}
return startupCommandsArray;
}

private StartupStorageCommand createLocalStoragePool(String localStoragePath, String localStorageUUID, StartupRoutingCommand cmd) {
StartupStorageCommand sscmd = null;
try {

final KVMStoragePool localStoragePool = _storagePoolMgr.createStoragePool(_localStorageUUID, "localhost", -1, _localStoragePath, "", StoragePoolType.Filesystem);
final KVMStoragePool localStoragePool = _storagePoolMgr.createStoragePool(localStorageUUID, "localhost", -1, localStoragePath, "", StoragePoolType.Filesystem);
final com.cloud.agent.api.StoragePoolInfo pi =
new com.cloud.agent.api.StoragePoolInfo(localStoragePool.getUuid(), cmd.getPrivateIpAddress(), _localStoragePath, _localStoragePath,
new com.cloud.agent.api.StoragePoolInfo(localStoragePool.getUuid(), cmd.getPrivateIpAddress(), localStoragePath, localStoragePath,
StoragePoolType.Filesystem, localStoragePool.getCapacity(), localStoragePool.getAvailable());

sscmd = new StartupStorageCommand();
Expand All @@ -3301,12 +3353,7 @@ public StartupCommand[] initialize() {
} catch (final CloudRuntimeException e) {
s_logger.debug("Unable to initialize local storage pool: " + e);
}

if (sscmd != null) {
return new StartupCommand[] {cmd, sscmd};
} else {
return new StartupCommand[] {cmd};
}
return sscmd;
}

public String diskUuidToSerial(String uuid) {
Expand Down
36 changes: 36 additions & 0 deletions ...ors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5841,4 +5841,40 @@ public void setCpuSharesTestSuccessfullySetCpuShares() throws LibvirtException {
return true;
}));
}

private void configLocalStorageTests(Map<String, Object> params) throws ConfigurationException {
LibvirtComputingResource libvirtComputingResourceSpy = Mockito.spy(new LibvirtComputingResource());
libvirtComputingResourceSpy.configureLocalStorage(params);
}

@Test
public void testConfigureLocalStorageWithEmptyParams() throws ConfigurationException {
Map<String, Object> params = new HashMap<>();
configLocalStorageTests(params);
}

@Test
public void testConfigureLocalStorageWithMultiplePaths() throws ConfigurationException {
Map<String, Object> params = new HashMap<>();
params.put(LibvirtComputingResource.LOCAL_STORAGE_PATH, "/var/lib/libvirt/images/,/var/lib/libvirt/images2/");
params.put(LibvirtComputingResource.LOCAL_STORAGE_UUID, UUID.randomUUID().toString() + "," + UUID.randomUUID().toString());
configLocalStorageTests(params);
}

@Test(expected = ConfigurationException.class)
public void testConfigureLocalStorageWithDifferentLength() throws ConfigurationException {
Map<String, Object> params = new HashMap<>();
params.put(LibvirtComputingResource.LOCAL_STORAGE_PATH, "/var/lib/libvirt/images/,/var/lib/libvirt/images2/");
params.put(LibvirtComputingResource.LOCAL_STORAGE_UUID, UUID.randomUUID().toString());
configLocalStorageTests(params);
}

@Test(expected = ConfigurationException.class)
public void testConfigureLocalStorageWithInvalidUUID() throws ConfigurationException {
Map<String, Object> params = new HashMap<>();
params.put(LibvirtComputingResource.LOCAL_STORAGE_PATH, "/var/lib/libvirt/images/");
params.put(LibvirtComputingResource.LOCAL_STORAGE_UUID, "111111");
configLocalStorageTests(params);
}

}