Federico Simoncelli has uploaded a new change for review.
Change subject: Revert "engine: Make VDSPartial, a partially loaded VDS object"
......................................................................
Revert "engine: Make VDSPartial, a partially loaded VDS object"
This reverts commit dfedf74bd738a568418b4262dd5225fabc0d1083.
Change-Id: I6bf4dbb3138d33b337c0f530b15fe23dfad998b5
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSPartial.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
5 files changed, 3 insertions(+), 748 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/21476/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSPartial.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSPartial.java
deleted file mode 100644
index 7c4061c..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSPartial.java
+++ /dev/null
@@ -1,687 +0,0 @@
-package org.ovirt.engine.core.common.businessentities;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.ovirt.engine.core.common.businessentities.network.Network;
-import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.compat.RpmVersion;
-import org.ovirt.engine.core.compat.Version;
-
-public class VDSPartial extends VDS {
-
- private static final long serialVersionUID = -3143712074770629093L;
-
- @Override
- public Version getVdsGroupCompatibilityVersion() {
- return super.getVdsGroupCompatibilityVersion();
- }
-
- @Override
- public boolean getContainingHooks() {
- return super.getContainingHooks();
- }
-
- @Override
- public String getHooksStr() {
- return super.getHooksStr();
- }
-
- @Override
- public Guid getVdsGroupId() {
- return super.getVdsGroupId();
- }
-
- @Override
- public String getVdsGroupName() {
- return super.getVdsGroupName();
- }
-
- @Override
- public String getVdsGroupDescription() {
- return super.getVdsGroupDescription();
- }
-
- @Override
- public String getVdsGroupCpuName() {
- return super.getVdsGroupCpuName();
- }
-
- @Override
- public Boolean getVdsGroupSupportsVirtService() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Boolean getVdsGroupSupportsGlusterService() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Guid getId() {
- return super.getId();
- }
-
- @Override
- public String getName() {
- return super.getName();
- }
-
- @Override
- public String getManagementIp() {
- return super.getManagementIp();
- }
-
- @Override
- public String getUniqueId() {
- return super.getUniqueId();
- }
-
- @Override
- public String getHostName() {
- return super.getHostName();
- }
-
- @Override
- public String getComment() {
- return super.getComment();
- }
-
- @Override
- public int getPort() {
- return super.getPort();
- }
-
- @Override
- public int getSshPort() {
- return super.getSshPort();
- }
-
- @Override
- public String getSshUsername() {
- return super.getSshUsername();
- }
-
- @Override
- public boolean isServerSslEnabled() {
- return super.isServerSslEnabled();
- }
-
- @Override
- public VDSType getVdsType() {
- return super.getVdsType();
- }
-
- @Override
- public VDSStatus getStatus() {
- return super.getStatus();
- }
-
- @Override
- public Integer getCpuCores() {
- return super.getCpuCores();
- }
-
- @Override
- public Integer getCpuThreads() {
- return super.getCpuThreads();
- }
-
- @Override
- public String getHardwareUUID() {
- return super.getHardwareUUID();
- }
-
- @Override
- public String getHardwareManufacturer() {
- return super.getHardwareManufacturer();
- }
-
- @Override
- public String getHardwareFamily() {
- return super.getHardwareFamily();
- }
-
- @Override
- public String getHardwareSerialNumber() {
- return super.getHardwareSerialNumber();
- }
-
- @Override
- public String getHardwareProductName() {
- return super.getHardwareProductName();
- }
-
- @Override
- public String getHardwareVersion() {
- return super.getHardwareVersion();
- }
-
- @Override
- public Integer getCpuSockets() {
- return super.getCpuSockets();
- }
-
- @Override
- public String getCpuModel() {
- return super.getCpuModel();
- }
-
- @Override
- public Double getCpuSpeedMh() {
- return super.getCpuSpeedMh();
- }
-
- @Override
- public String getIfTotalSpeed() {
- return super.getIfTotalSpeed();
- }
-
- @Override
- public Boolean getKvmEnabled() {
- return super.getKvmEnabled();
- }
-
- @Override
- public Integer getPhysicalMemMb() {
- return super.getPhysicalMemMb();
- }
-
- @Override
- public String getSupportedClusterLevels() {
- return super.getSupportedClusterLevels();
- }
-
- @Override
- public HashSet<Version> getSupportedClusterVersionsSet() {
- return super.getSupportedClusterVersionsSet();
- }
-
- @Override
- public String getSupportedEngines() {
- return super.getSupportedEngines();
- }
-
- @Override
- public HashSet<Version> getSupportedENGINESVersionsSet() {
- return super.getSupportedENGINESVersionsSet();
- }
-
- @Override
- public Double getCpuIdle() {
- return super.getCpuIdle();
- }
-
- @Override
- public Double getCpuLoad() {
- return super.getCpuLoad();
- }
-
- @Override
- public Double getCpuSys() {
- return super.getCpuSys();
- }
-
- @Override
- public Double getCpuUser() {
- return super.getCpuUser();
- }
-
- @Override
- public Integer getMemCommited() {
- return super.getMemCommited();
- }
-
- @Override
- public Integer getVmActive() {
- return super.getVmActive();
- }
-
- @Override
- public Integer getHighlyAvailableScore() {
- return super.getHighlyAvailableScore();
- }
-
- @Override
- public int getVmCount() {
- return super.getVmCount();
- }
-
- @Override
- public Integer getVmsCoresCount() {
- return super.getVmsCoresCount();
- }
-
- @Override
- public Integer getVmMigrating() {
- return super.getVmMigrating();
- }
-
- @Override
- public Integer getUsageMemPercent() {
- return super.getUsageMemPercent();
- }
-
- @Override
- public Integer getUsageCpuPercent() {
- return super.getUsageCpuPercent();
- }
-
- @Override
- public Integer getUsageNetworkPercent() {
- return super.getUsageNetworkPercent();
- }
-
- @Override
- public Integer getGuestOverhead() {
- return super.getGuestOverhead();
- }
-
- @Override
- public Integer getReservedMem() {
- return super.getReservedMem();
- }
-
- @Override
- public VDSStatus getPreviousStatus() {
- return super.getPreviousStatus();
- }
-
- @Override
- public Long getMemAvailable() {
- return super.getMemAvailable();
- }
-
- @Override
- public Long getMemFree() {
- return super.getMemFree();
- }
-
- @Override
- public Long getMemShared() {
- return super.getMemShared();
- }
-
- @Override
- public String getConsoleAddress() {
- return super.getConsoleAddress();
- }
-
- @Override
- public Integer getMemCommitedPercent() {
- return super.getMemCommitedPercent();
- }
-
- @Override
- public Integer getMemSharedPercent() {
- return super.getMemSharedPercent();
- }
-
- @Override
- public Long getSwapFree() {
- return super.getSwapFree();
- }
-
- @Override
- public Long getSwapTotal() {
- return super.getSwapTotal();
- }
-
- @Override
- public Integer getKsmCpuPercent() {
- return super.getKsmCpuPercent();
- }
-
- @Override
- public Long getKsmPages() {
- return super.getKsmPages();
- }
-
- @Override
- public Boolean getKsmState() {
- return super.getKsmState();
- }
-
- @Override
- public String getSoftwareVersion() {
- return super.getSoftwareVersion();
- }
-
- @Override
- public String getVersionName() {
- return super.getVersionName();
- }
-
- @Override
- public String getBuildName() {
- return super.getBuildName();
- }
-
- @Override
- public String getCpuFlags() {
- return super.getCpuFlags();
- }
-
- @Override
- public Date getCpuOverCommitTimestamp() {
- return super.getCpuOverCommitTimestamp();
- }
-
- @Override
- public int getVdsStrength() {
- return super.getVdsStrength();
- }
-
- @Override
- public int getHighUtilization() {
- return super.getHighUtilization();
- }
-
- @Override
- public int getLowUtilization() {
- return super.getLowUtilization();
- }
-
- @Override
- public int getCpuOverCommitDurationMinutes() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Guid getStoragePoolId() {
- return super.getStoragePoolId();
- }
-
- @Override
- public String getStoragePoolName() {
- return super.getStoragePoolName();
- }
-
- @Override
- public int getMaxVdsMemoryOverCommit() {
- return super.getMaxVdsMemoryOverCommit();
- }
-
- @Override
- public Integer getPendingVcpusCount() {
- return super.getPendingVcpusCount();
- }
-
- @Override
- public int getPendingVmemSize() {
- return super.getPendingVmemSize();
- }
-
- @Override
- public Boolean getNetConfigDirty() {
- return super.getNetConfigDirty();
- }
-
- @Override
- public String getPmType() {
- return super.getPmType();
- }
-
- @Override
- public String getPmUser() {
- return super.getPmUser();
- }
-
- @Override
- public String getPmPassword() {
- return super.getPmPassword();
- }
-
- @Override
- public Integer getPmPort() {
- return super.getPmPort();
- }
-
- @Override
- public String getPmOptions() {
- return super.getPmOptions();
- }
-
- @Override
- public HashMap<String, String> getPmOptionsMap() {
- return super.getPmOptionsMap();
- }
-
- @Override
- public HashMap<String, String> getPmSecondaryOptionsMap() {
- return super.getPmSecondaryOptionsMap();
- }
-
- @Override
- public boolean getpm_enabled() {
- return super.getpm_enabled();
- }
-
- @Override
- public String getPmProxyPreferences() {
- return super.getPmProxyPreferences();
- }
-
- @Override
- public String getPmSecondaryIp() {
- return super.getPmSecondaryIp();
- }
-
- @Override
- public String getPmSecondaryType() {
- return super.getPmSecondaryType();
- }
-
- @Override
- public String getPmSecondaryUser() {
- return super.getPmSecondaryUser();
- }
-
- @Override
- public String getPmSecondaryPassword() {
- return super.getPmSecondaryPassword();
- }
-
- @Override
- public Integer getPmSecondaryPort() {
- return super.getPmSecondaryPort();
- }
-
- @Override
- public String getPmSecondaryOptions() {
- return super.getPmSecondaryOptions();
- }
-
- @Override
- public boolean isPmSecondaryConcurrent() {
- return super.isPmSecondaryConcurrent();
- }
-
- @Override
- public String getHostOs() {
- return super.getHostOs();
- }
-
- @Override
- public String getKvmVersion() {
- return super.getKvmVersion();
- }
-
- @Override
- public RpmVersion getLibvirtVersion() {
- return super.getLibvirtVersion();
- }
-
- @Override
- public String getSpiceVersion() {
- return super.getSpiceVersion();
- }
-
- @Override
- public String getKernelVersion() {
- return super.getKernelVersion();
- }
-
- @Override
- public String getIScsiInitiatorName() {
- return super.getIScsiInitiatorName();
- }
-
- @Override
- public Map<String, List<Map<String, String>>> getHBAs() {
- return super.getHBAs();
- }
-
- @Override
- public VdsTransparentHugePagesState getTransparentHugePagesState() {
- return super.getTransparentHugePagesState();
- }
-
- @Override
- public int getAnonymousHugePages() {
- return super.getAnonymousHugePages();
- }
-
- @Override
- public VdsStatic getStaticData() {
- return super.getStaticData();
- }
-
- @Override
- public VdsDynamic getDynamicData() {
- return super.getDynamicData();
- }
-
- @Override
- public VdsStatistics getStatisticsData() {
- return super.getStatisticsData();
- }
-
- @Override
- public ArrayList<Network> getNetworks() {
- return super.getNetworks();
- }
-
- @Override
- public ArrayList<VdsNetworkInterface> getInterfaces() {
- return super.getInterfaces();
- }
-
- public ArrayList<VDSDomainsData> getDomains() {
- return super.getDomains();
- }
-
- @Override
- public Double getImagesLastCheck() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Double getImagesLastDelay() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public RpmVersion getVersion() {
- return super.getVersion();
- }
-
- @Override
- public String getPartialVersion() {
- return super.getPartialVersion();
- }
-
- @Override
- public ServerCpu getCpuName() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Integer getVdsSpmId() {
- return super.getVdsSpmId();
- }
-
- @Override
- public long getOtpValidity() {
- return super.getOtpValidity();
- }
-
- @Override
- public int getVdsSpmPriority() {
- return super.getVdsSpmPriority();
- }
-
- @Override
- public Object getQueryableId() {
- return super.getQueryableId();
- }
-
- @Override
- public VdsSpmStatus getSpmStatus() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public NonOperationalReason getNonOperationalReason() {
- return super.getNonOperationalReason();
- }
-
- @Override
- public Map<String, Long> getLocalDisksUsage() {
- return super.getLocalDisksUsage();
- }
-
- @Override
- public boolean isAutoRecoverable() {
- return super.isAutoRecoverable();
- }
-
- @Override
- public String getSshKeyFingerprint() {
- return super.getSshKeyFingerprint();
- }
-
- @Override
- public float getMaxSchedulingMemory() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getActiveNic() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getSupportedEmulatedMachines() {
- return super.getSupportedEmulatedMachines();
- }
-
- public VDS clone() {
- VDS vds = new VDSPartial();
- // TODO: Create clone to dynamic, static, statistics --> and reuse in
VDS
- vds.setDynamicData(getDynamicData());
- vds.setStaticData(getStaticData());
- vds.setStatisticsData(getStatisticsData());
- vds.setVdsGroupCompatibilityVersion(getVdsGroupCompatibilityVersion());
- vds.setVdsGroupCpuName(getVdsGroupCpuName());
- vds.setVdsGroupDescription(getVdsGroupDescription());
- vds.setVdsGroupName(getVdsGroupName());
- vds.setStoragePoolId(getStoragePoolId());
- vds.setStoragePoolName(getStoragePoolName());
- vds.getInterfaces().addAll(getInterfaces());
- vds.setDomains(getDomains());
- vds.getNetworks().addAll(getNetworks());
- vds.setVdsSpmId(vds.getVdsSpmId());
-
- vds.setHighUtilization(getHighUtilization());
- vds.setLowUtilization(getLowUtilization());
- vds.setLocalDisksUsage(getLocalDisksUsage());
-
- return vds;
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
index 7e9ef8c0..0098504 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
@@ -89,7 +89,7 @@
*/
List<VDS> getAllOfTypes(VDSType[] types);
- /**Next patch (still in the making)
+ /**
* Retrieves all instances by group id.
*
* @param vdsGroup
@@ -125,7 +125,7 @@
List<VDS> getAllForVdsGroup(Guid vdsGroup);
/**
- * Retrieves all VDS instances by vdNext patch (still in the making)s
group id (cluster ID) with optional filtering
+ * Retrieves all VDS instances by vds group id (cluster ID) with optional
filtering
*
* @param vdsGroup
* @param userID
@@ -209,20 +209,4 @@
* @return the list of VDS instances
*/
List<VDS> getHostsForStorageOperation(Guid storagePoolId, boolean
localFsOnly);
-
- /**
- * Retrieve the partial instance (static, dynamic) with the given id.
- * @param id
- * the id
- * @return the VDS instance
- */
- VDS getPartial(Guid vdsId);
-
- /**
- * Completes the retrieval of the partial instance
- * @param id
- * the id
- * @return the PartialVDS instance
- */
- void reloadPartial(VDS vds);
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index 123e88f..1f26158 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.core.common.businessentities.NonOperationalReason;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.VDSType;
import org.ovirt.engine.core.common.businessentities.VdsSpmStatus;
@@ -16,7 +15,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.RpmVersion;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
import org.ovirt.engine.core.utils.serialization.json.JsonObjectDeserializer;
import org.springframework.jdbc.core.RowMapper;
@@ -344,35 +342,5 @@
entity.calculateFreeVirtualMemory();
return entity;
}
- }
-
- @Override
- public VDS getPartial(Guid vdsId) {
- VDS vdsPartial = new VDS();
-
- // TODO: From cache
-
vdsPartial.setStaticData(DbFacade.getInstance().getVdsStaticDao().get(vdsId));
-
vdsPartial.setDynamicData(DbFacade.getInstance().getVdsDynamicDao().get(vdsId));
-
- // TODO: From cache
- VDSGroup group =
DbFacade.getInstance().getVdsGroupDao().get(vdsPartial.getVdsGroupId());
-
vdsPartial.setVdsGroupCompatibilityVersion(group.getcompatibility_version());
- vdsPartial.setVdsGroupCpuName(group.getcpu_name());
- vdsPartial.setVdsGroupDescription(group.getdescription());
- vdsPartial.setVdsGroupName(group.getName());
- vdsPartial.setStoragePoolId(group.getStoragePoolId());
- vdsPartial.setStoragePoolName(group.getStoragePoolName());
-
vdsPartial.setMaxVdsMemoryOverCommit(group.getmax_vds_memory_over_commit());
-
- return vdsPartial;
- }
-
- @Override
- public void reloadPartial(VDS vds) {
-
vds.setStatisticsData(DbFacade.getInstance().getVdsStatisticsDao().get(vds.getId()));
-
- // TODO: From cache?!?
-
vds.setVdsSpmId(DbFacade.getInstance().getVdsSpmIdMapDao().get(vds.getId()).getvds_spm_id());
-
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 097397a..69c0739 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -217,7 +217,7 @@
ArrayList<VDSDomainsData> domainsList = null;
VDS tmpVds;
synchronized (getLockObj()) {
- tmpVds = _vds =
DbFacade.getInstance().getVdsDao().getPartial(getVdsId());
+ tmpVds = _vds =
DbFacade.getInstance().getVdsDao().get(getVdsId());
if (_vds == null) {
log.errorFormat("VdsManager::refreshVdsRunTimeInfo -
OnTimer is NULL for {0}",
getVdsId());
@@ -628,9 +628,6 @@
*/
public boolean handleNetworkException(VDSNetworkException ex, VDS vds) {
if (vds.getStatus() != VDSStatus.Down) {
- // For SpmStatus we need to reload VDS
- vds = DbFacade.getInstance().getVdsDao().get(vds.getId());
-
long timeoutToFence = calcTimeoutToFence(vds.getVmCount(),
vds.getSpmStatus());
if (mUnrespondedAttempts.get() < Config.<Integer>
GetValue(ConfigValues.VDSAttemptsToResetCount)
|| (lastUpdate + timeoutToFence) >
System.currentTimeMillis()) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 19f7744..26bbaaf 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -345,9 +345,6 @@
} finally {
try {
if (_firstStatus != _vds.getStatus() && _vds.getStatus() ==
VDSStatus.Up) {
- // If status changed, reload the entire vds
- reloadVds(_vds);
-
// use this lock in order to allow only one host updating
DB and
// calling UpEvent in a time
VdsManager.cancelRecoveryJob(_vds.getId());
@@ -512,10 +509,6 @@
}
}
moveVDSToMaintenanceIfNeeded();
- }
-
- private void reloadVds(VDS vds) {
- DbFacade.getInstance().getVdsDao().reloadPartial(vds);
}
private void refreshVdsStats() {
--
To view, visit http://gerrit.ovirt.org/21476
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bf4dbb3138d33b337c0f530b15fe23dfad998b5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
