Michael Kublin has uploaded a new change for review.
Change subject: engine: Removed useless try catch block
......................................................................
engine: Removed useless try catch block
The following patch is removes useless try catch block from
VdsUpdateRunTimeInfo.
If exception is thrown we have a bug and it should be fixed and not hidden
Change-Id: Icdf2d2a3b003866c7c2b7560e617d84c84e8c4a4
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
1 file changed, 24 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/13054/1
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 b867ced..f94ab25 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
@@ -701,38 +701,32 @@
// non-operational
hostDownTimes.remove(_vds.getId());
- try {
- StringBuilder sNics = new StringBuilder();
- StringBuilder sNetworks = new StringBuilder();
+ StringBuilder sNics = new StringBuilder();
+ StringBuilder sNetworks = new StringBuilder();
- for (String nic : brokenNics) {
- sNics.append(nic)
- .append(", ");
- }
- for (String net : networks) {
- sNetworks.append(net)
- .append(", ");
- }
-
- String message =
- String.format(
- "Host '%s' moved to Non-Operational state
because interface/s '%s' are down which needed by network/s '%s' in the current
cluster",
- _vds.getName(),
- sNics.toString(),
- sNetworks.toString());
-
- _vdsManager.setStatus(VDSStatus.NonOperational, _vds);
- log.info(message);
-
- AuditLogableBase logable = new
AuditLogableBase(_vds.getId());
- logable.addCustomValue("Networks",
StringUtils.stripEnd(sNetworks.toString(), ", "));
- logable.addCustomValue("Interfaces",
StringUtils.stripEnd(sNics.toString(), ", "));
- auditLog(logable,
AuditLogType.VDS_SET_NONOPERATIONAL_IFACE_DOWN);
- } catch (Exception e) {
- log.error(String.format("checkInterface: Failure on moving
host: %s to non-operational.",
- _vds.getName()),
- e);
+ for (String nic : brokenNics) {
+ sNics.append(nic)
+ .append(", ");
}
+ for (String net : networks) {
+ sNetworks.append(net)
+ .append(", ");
+ }
+
+ String message =
+ String.format(
+ "Host '%s' moved to Non-Operational state
because interface/s '%s' are down which needed by network/s '%s' in the current
cluster",
+ _vds.getName(),
+ sNics.toString(),
+ sNetworks.toString());
+
+ _vdsManager.setStatus(VDSStatus.NonOperational, _vds);
+ log.info(message);
+
+ AuditLogableBase logable = new AuditLogableBase(_vds.getId());
+ logable.addCustomValue("Networks",
StringUtils.stripEnd(sNetworks.toString(), ", "));
+ logable.addCustomValue("Interfaces",
StringUtils.stripEnd(sNics.toString(), ", "));
+ auditLog(logable,
AuditLogType.VDS_SET_NONOPERATIONAL_IFACE_DOWN);
} else {
// no nics are down, remove from list if exists
hostDownTimes.remove(_vds.getId());
--
To view, visit http://gerrit.ovirt.org/13054
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdf2d2a3b003866c7c2b7560e617d84c84e8c4a4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
