Federico Simoncelli has uploaded a new change for review.
Change subject: Revert "engine: Change loading of VdsGroup to load from cache"
......................................................................
Revert "engine: Change loading of VdsGroup to load from cache"
This reverts commit 45d7974a1fed8f3cd630b0938eb085d5f3405cf6.
Change-Id: I37fa65971e1b65cd7c8b2100becdc57c3a2a7728
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
4 files changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/21474/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
index ed287d0..296ae55 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
@@ -43,7 +43,7 @@
DbFacade.getInstance().getNetworkClusterDao().get(new
NetworkClusterId(vdsGroupId, net.getId()));
if (networkCluster != null) {
- VDSGroup vdsGroup =
DbFacade.getInstance().getVdsGroupDao().getFromCache(vdsGroupId);
+ VDSGroup vdsGroup =
DbFacade.getInstance().getVdsGroupDao().get(vdsGroupId);
// Search all vds in cluster that have the specify network, if not
the
// network is not active
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
index 24d0894..4c54157 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
@@ -411,16 +411,16 @@
public VDSGroup getVdsGroup() {
if (mVdsGroup == null) {
if (mVdsGroupId != null) {
- mVdsGroup = getVdsGroupDAO().getFromCache(mVdsGroupId);
+ mVdsGroup = getVdsGroupDAO().get(mVdsGroupId);
} else if (getVds() != null) {
mVdsGroupId = getVds().getVdsGroupId();
- mVdsGroup = getVdsGroupDAO().getFromCache(mVdsGroupId);
+ mVdsGroup = getVdsGroupDAO().get(mVdsGroupId);
} else if (getVm() != null) {
mVdsGroupId = getVm().getVdsGroupId();
- mVdsGroup = getVdsGroupDAO().getFromCache(mVdsGroupId);
+ mVdsGroup = getVdsGroupDAO().get(mVdsGroupId);
} else if (getVmTemplate() != null) {
mVdsGroupId = getVmTemplate().getVdsGroupId();
- mVdsGroup = getVdsGroupDAO().getFromCache(mVdsGroupId);
+ mVdsGroup = getVdsGroupDAO().get(mVdsGroupId);
}
}
return mVdsGroup;
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 6877b0d..19f7744 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
@@ -1373,7 +1373,7 @@
}
private boolean isBalloonActiveOnHost() {
- VDSGroup cluster =
getDbFacade().getVdsGroupDao().getFromCache(_vds.getVdsGroupId());
+ VDSGroup cluster =
getDbFacade().getVdsGroupDao().get(_vds.getVdsGroupId());
return cluster != null && cluster.isEnableBallooning();
}
@@ -1389,6 +1389,13 @@
return false;
}
+ private Long toMegaByte(Long kilobytes) {
+ if (kilobytes != null && kilobytes > 0) {
+ return kilobytes / TO_MEGA_BYTES;
+ }
+ return 0L;
+ }
+
protected static boolean isNewWatchdogEvent(VmDynamic vmDynamic, VM vmTo) {
Long lastWatchdogEvent = vmDynamic.getLastWatchdogEvent();
return vmTo != null && lastWatchdogEvent != null
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
index 8a3bc51..a990586 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
@@ -50,7 +50,7 @@
}
- VDSGroup vdsGroup = vdsGroupDao.getFromCache(vds.getVdsGroupId());
+ VDSGroup vdsGroup = vdsGroupDao.get(vds.getVdsGroupId());
if (!hostCompliesWithClusterEmulationMode(vds, vdsGroup) &&
vds.getStatus() != VDSStatus.NonOperational) {
Map<String, String> customLogValues = new HashMap<>();
--
To view, visit http://gerrit.ovirt.org/21474
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37fa65971e1b65cd7c8b2100becdc57c3a2a7728
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
