Sergey Gotliv has uploaded a new change for review. Change subject: engine: Use getFileStats to retrieve iso and floppy files ......................................................................
engine: Use getFileStats to retrieve iso and floppy files VDSM introduced new API getFileStats in 3.4 which returns statistics of all files in the domain filtered according to pattern. Now Engine starts using this new API, because file statistics are significantly better in comparison with the existing getIsoList and getFileList and allow Engine to provide additional information in UI, for example a file size. Change-Id: I735d2c9343fe791e0890b4a6cc9f12c74462b3f0 Bug-Url: https://bugzilla.redhat.com/1005889 Signed-off-by: Sergey Gotliv <sgot...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java R backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 15 files changed, 177 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/24265/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index 4e48cfc..bbfc42d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -16,12 +16,14 @@ import org.ovirt.engine.core.bll.provider.OpenStackImageProviderProxy; import org.ovirt.engine.core.bll.provider.ProviderProxyFactory; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.businessentities.ImageFileType; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.RepoImage; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -30,6 +32,7 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.constants.StorageConstants; import org.ovirt.engine.core.common.utils.Pair; +import org.ovirt.engine.core.common.vdscommands.GetFileStatsParameters; import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -40,6 +43,7 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.RepoFileMetaDataDAO; import org.ovirt.engine.core.dao.StorageDomainDAO; +import org.ovirt.engine.core.dao.StoragePoolDAO; import org.ovirt.engine.core.dao.provider.ProviderDao; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -67,6 +71,7 @@ private int isoDomainRefreshRate; RepoFileMetaDataDAO repoStorageDom; ProviderDao providerDao; + public static final String TOOL_CLUSTER_LEVEL = "clusterLevel"; public static final String TOOL_VERSION = "toolVersion"; public static final String REGEX_TOOL_PATTERN = @@ -74,6 +79,8 @@ getGuestToolsSetupIsoPrefix(), TOOL_CLUSTER_LEVEL, TOOL_VERSION); + public static final String ISO_FILE_PATTERN = "*.iso"; + public static final String FLOPPY_FILE_PATTERN = "*.vfd"; // Not kept as static member to enable reloading the config value public static String getGuestToolsSetupIsoPrefix() { @@ -637,14 +644,26 @@ */ private boolean updateIsoListFromVDSM(Guid repoStoragePoolId, Guid repoStorageDomainId) { boolean refreshIsoSucceeded = false; + VDSReturnValue returnValue; + if (repoStorageDomainId != null) { try { - // Get Iso domain file list from storage pool. - VDSReturnValue returnValue = Backend - .getInstance() - .getResourceManager() - .RunVdsCommand(VDSCommandType.GetIsoList, - new IrsBaseVDSCommandParameters(repoStoragePoolId)); + StoragePool dc = getStoragePoolDAO().get(repoStoragePoolId); + if (FeatureSupported.getFileStats(dc.getcompatibility_version())) { + returnValue = Backend + .getInstance() + .getResourceManager() + .RunVdsCommand(VDSCommandType.GetFileStats, + new GetFileStatsParameters(repoStoragePoolId, + repoStorageDomainId, ISO_FILE_PATTERN, false)); + } else { + returnValue = Backend + .getInstance() + .getResourceManager() + .RunVdsCommand(VDSCommandType.GetIsoList, + new IrsBaseVDSCommandParameters(repoStoragePoolId)); + } + @SuppressWarnings("unchecked") Map<String, Map<String, Object>> fileStats = (Map<String, Map<String, Object>>) returnValue.getReturnValue(); @@ -677,14 +696,26 @@ */ private boolean updateFloppyListFromVDSM(Guid repoStoragePoolId, Guid repoStorageDomainId) { boolean refreshFloppySucceeded = false; + VDSReturnValue returnValue; + if (repoStorageDomainId != null) { try { - // Get Iso domain floppy file list from storage pool. - VDSReturnValue returnValue = Backend - .getInstance() - .getResourceManager() - .RunVdsCommand(VDSCommandType.GetFloppyList, - new IrsBaseVDSCommandParameters(repoStoragePoolId)); + StoragePool dc = getStoragePoolDAO().get(repoStoragePoolId); + if (FeatureSupported.getFileStats(dc.getcompatibility_version())) { + returnValue = Backend + .getInstance() + .getResourceManager() + .RunVdsCommand(VDSCommandType.GetFileStats, + new GetFileStatsParameters(repoStoragePoolId, + repoStorageDomainId, FLOPPY_FILE_PATTERN, false)); + } else { + returnValue = Backend + .getInstance() + .getResourceManager() + .RunVdsCommand(VDSCommandType.GetFloppyList, + new IrsBaseVDSCommandParameters(repoStoragePoolId)); + } + @SuppressWarnings("unchecked") Map<String, Map<String, Object>> fileStats = (Map<String, Map<String, Object>>) returnValue.getReturnValue(); @@ -781,4 +812,8 @@ private StorageDomainDAO getStorageDomainDAO() { return DbFacade.getInstance().getStorageDomainDao(); } + + private StoragePoolDAO getStoragePoolDAO() { + return DbFacade.getInstance().getStoragePoolDao(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java index d715ad2..fe72eb1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java @@ -211,4 +211,13 @@ public static boolean hotPlugCpu(Version version, ArchitectureType arch) { return supportedInConfig(ConfigValues.HotPlugCpuSupported, version, arch); } + + /** + * @param version + * Compatibility version to check for. + * @return <code>true</code> if get file stats is supported for the given version. + */ + public static boolean getFileStats(Version version) { + return supportedInConfig(ConfigValues.GetFileStats, version); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 6d28ba8..9a71fb3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1622,5 +1622,9 @@ @DefaultValueAttribute("") ChangePasswordMsg, + @TypeConverterAttribute(Boolean.class) + @DefaultValueAttribute("true") + GetFileStats, + Invalid; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java new file mode 100644 index 0000000..015f55c --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java @@ -0,0 +1,52 @@ +package org.ovirt.engine.core.common.vdscommands; + +import org.ovirt.engine.core.compat.Guid; + +public class GetFileStatsParameters extends IrsBaseVDSCommandParameters { + + private Guid spUUID; + private Guid sdUUID; + private String pattern; + private boolean caseSensitive; + + public GetFileStatsParameters() {} + + public GetFileStatsParameters(Guid spUUID, Guid sdUUID, String pattern, boolean caseSensitive) { + super(spUUID); + this.sdUUID = sdUUID; + this.pattern = pattern; + this.caseSensitive = caseSensitive; + } + + public Guid getSpUUID() { + return spUUID; + } + + public void setSpUUID(Guid spUUID) { + this.spUUID = spUUID; + } + + public Guid getSdUUID() { + return sdUUID; + } + + public void setSdUUID(Guid sdUUID) { + this.sdUUID = sdUUID; + } + + public String getPattern() { + return pattern; + } + + public void setPattern(String pattern) { + this.pattern = pattern; + } + + public boolean isCaseSensitive() { + return caseSensitive; + } + + public void setCaseSensitive(boolean caseSensitive) { + this.caseSensitive = caseSensitive; + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 8c3d8a9..3b9aea0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -71,6 +71,7 @@ ResetIrs("org.ovirt.engine.core.vdsbroker.irsbroker"), GetIsoList("org.ovirt.engine.core.vdsbroker.irsbroker"), HsmGetIsoList("org.ovirt.engine.core.vdsbroker.vdsbroker"), + GetFileStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetFloppyList("org.ovirt.engine.core.vdsbroker.irsbroker"), CreateStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"), ActivateStorageDomain("org.ovirt.engine.core.vdsbroker.irsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java similarity index 94% rename from backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java rename to backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java index c5b5cd7..20188eb 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IsoListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/FileStatsReturnForXmlRpc.java @@ -8,11 +8,11 @@ import java.util.List; import java.util.Map; -public final class IsoListReturnForXmlRpc extends StatusReturnForXmlRpc { +public final class FileStatsReturnForXmlRpc extends StatusReturnForXmlRpc { private Map<String, Map<String, Object>> fileStats; - public IsoListReturnForXmlRpc(Map<String, Object> innerMap) { + public FileStatsReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); // New VDSM returns a map with file names as key and file stats as value. // The map contains all files even those without proper permissions. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java index eef4bb9..27500d7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java @@ -5,7 +5,7 @@ import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSExceptionBase; public class GetFloppyListVDSCommand<P extends IrsBaseVDSCommandParameters> extends GetIsoListVDSCommand<P> { - protected IsoListReturnForXmlRpc floppyList; + protected FileStatsReturnForXmlRpc floppyList; public GetFloppyListVDSCommand(P parameters) { super(parameters); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java index 89a8f13..bc261ba 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java @@ -32,9 +32,11 @@ OneUuidReturnForXmlRpc importCandidate(String sdUUID, String vmGUID, String templateGUID, String templateVolGUID, String path, String type, String force); - IsoListReturnForXmlRpc getIsoList(String spUUID); + FileStatsReturnForXmlRpc getIsoList(String spUUID); - IsoListReturnForXmlRpc getFloppyList(String spUUID); + FileStatsReturnForXmlRpc getFloppyList(String spUUID); + + FileStatsReturnForXmlRpc getFileStats(String sdUUID, String pattern, boolean caseSensitive); StorageStatusReturnForXmlRpc activateStorageDomain(String sdUUID, String spUUID); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java index fe8b8b8..4b2c4f1 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java @@ -43,6 +43,8 @@ public Map<String, Object> getFloppyList(String spUUID); + public Map<String, Object> getFileStats(String sdUUID, String pattern, boolean caseSensitive); + public Map<String, Object> activateStorageDomain(String sdUUID, String spUUID); public Map<String, Object> deactivateStorageDomain(String sdUUID, String spUUID, String msdUUID, int masterVersion); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java index b58e35a..d4a081e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java @@ -93,16 +93,23 @@ } @Override - public IsoListReturnForXmlRpc getIsoList(String spUUID) { + public FileStatsReturnForXmlRpc getIsoList(String spUUID) { Map<String, Object> xmlRpcReturnValue = irsServer.getIsoList(spUUID); - IsoListReturnForXmlRpc wrapper = new IsoListReturnForXmlRpc(xmlRpcReturnValue); + FileStatsReturnForXmlRpc wrapper = new FileStatsReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } @Override - public IsoListReturnForXmlRpc getFloppyList(String spUUID) { + public FileStatsReturnForXmlRpc getFloppyList(String spUUID) { Map<String, Object> xmlRpcReturnValue = irsServer.getFloppyList(spUUID); - IsoListReturnForXmlRpc wrapper = new IsoListReturnForXmlRpc(xmlRpcReturnValue); + FileStatsReturnForXmlRpc wrapper = new FileStatsReturnForXmlRpc(xmlRpcReturnValue); + return wrapper; + } + + @Override + public FileStatsReturnForXmlRpc getFileStats(String sdUUID, String pattern, boolean caseSensitive) { + Map<String, Object> xmlRpcReturnValue = irsServer.getFileStats(sdUUID, pattern, caseSensitive); + FileStatsReturnForXmlRpc wrapper = new FileStatsReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java new file mode 100644 index 0000000..72adb44 --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java @@ -0,0 +1,33 @@ +package org.ovirt.engine.core.vdsbroker.vdsbroker; + +import org.ovirt.engine.core.common.vdscommands.GetFileStatsParameters; +import org.ovirt.engine.core.vdsbroker.irsbroker.FileStatsReturnForXmlRpc; +import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand; + +public class GetFileStatsVDSCommand<P extends GetFileStatsParameters> extends IrsBrokerCommand<P> { + + private FileStatsReturnForXmlRpc fileStats; + + public GetFileStatsVDSCommand(P parameters) { + super(parameters); + } + + @Override + protected void executeIrsBrokerCommand() { + fileStats = getIrsProxy().getFileStats(getParameters().getSdUUID().toString(), + getParameters().getPattern(), getParameters().isCaseSensitive()); + + proceedProxyReturnValue(); + setReturnValue(fileStats.getFileStats()); + } + + @Override + protected Object getReturnValueFromBroker() { + return fileStats; + } + + @Override + protected StatusForXmlRpc getReturnStatus() { + return fileStats.mStatus; + } +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java index 3acd181..a0d37ce 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java @@ -1,10 +1,10 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; import org.ovirt.engine.core.common.vdscommands.HSMGetIsoListParameters; -import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc; +import org.ovirt.engine.core.vdsbroker.irsbroker.FileStatsReturnForXmlRpc; public class HsmGetIsoListVDSCommand<P extends HSMGetIsoListParameters> extends VdsBrokerCommand<P> { - private IsoListReturnForXmlRpc isoList; + private FileStatsReturnForXmlRpc isoList; public HsmGetIsoListVDSCommand(P parameters) { super(parameters); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index e7ce087..173c9e6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -16,7 +16,7 @@ import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc; -import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc; +import org.ovirt.engine.core.vdsbroker.irsbroker.FileStatsReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.irsbroker.StoragePoolInfoReturnForXmlRpc; @@ -126,7 +126,7 @@ StorageDomainListReturnForXmlRpc getStorageDomainsList(String spUUID, int domainType, int poolType, String path); - IsoListReturnForXmlRpc getIsoList(String spUUID); + FileStatsReturnForXmlRpc getIsoList(String spUUID); OneUuidReturnForXmlRpc createVG(String sdUUID, String[] deviceList); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 814b232..ae3727b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -18,7 +18,7 @@ import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeTaskReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumesListReturnForXmlRpc; -import org.ovirt.engine.core.vdsbroker.irsbroker.IsoListReturnForXmlRpc; +import org.ovirt.engine.core.vdsbroker.irsbroker.FileStatsReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.irsbroker.OneUuidReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.irsbroker.StoragePoolInfoReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcRunTimeException; @@ -574,15 +574,14 @@ } @Override - public IsoListReturnForXmlRpc getIsoList(String spUUID) { + public FileStatsReturnForXmlRpc getIsoList(String spUUID) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getIsoList(spUUID); - IsoListReturnForXmlRpc wrapper = new IsoListReturnForXmlRpc(xmlRpcReturnValue); + FileStatsReturnForXmlRpc wrapper = new FileStatsReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } catch (UndeclaredThrowableException ute) { throw new XmlRpcRunTimeException(ute); } - } @Override diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 543a5de..3448a89 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -206,6 +206,10 @@ select fn_db_add_config_value('HotPlugDiskSnapshotSupported','false','3.0'); select fn_db_add_config_value('HotPlugDiskSnapshotSupported','false','3.1'); select fn_db_add_config_value('HotPlugDiskSnapshotSupported','false','3.2'); +select fn_db_add_config_value('GetFileStats','false','3.0'); +select fn_db_add_config_value('GetFileStats','false','3.1'); +select fn_db_add_config_value('GetFileStats','false','3.2'); +select fn_db_add_config_value('GetFileStats','false','3.3'); -- by default use no proxy select fn_db_add_config_value('SpiceProxyDefault','','general'); -- To view, visit http://gerrit.ovirt.org/24265 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I735d2c9343fe791e0890b4a6cc9f12c74462b3f0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
