Roy Golan has uploaded a new change for review. Change subject: core: VdsManager - pulling more methods up to the facade ......................................................................
core: VdsManager - pulling more methods up to the facade Change-Id: I4a3d406c4f65ba7f437c699c97908f531e89d4d7 Signed-off-by: Roy Golan <[email protected]> --- 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/VdsManagerFacade.java 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/27376/1 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 b783807..784d1bf 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 @@ -202,7 +202,7 @@ } catch (VDSNetworkException e) { logNetworkException(e); } catch (VDSRecoveringException ex) { - HandleVdsRecoveringException(ex); + handleVdsRecoveringException(ex); } catch (RuntimeException ex) { logFailureMessage(ex); } @@ -275,7 +275,8 @@ _vds.getStatus() != VDSStatus.PendingApproval && _vds.getStatus() != VDSStatus.Down); } - private void HandleVdsRecoveringException(VDSRecoveringException ex) { + @Override + public void handleVdsRecoveringException(VDSRecoveringException ex) { if (_vds.getStatus() != VDSStatus.Initializing && _vds.getStatus() != VDSStatus.NonOperational) { setStatus(VDSStatus.Initializing, _vds); DbFacade.getInstance().getVdsDynamicDao().updateStatus(_vds.getId(), VDSStatus.Initializing); @@ -617,7 +618,8 @@ * @param e * The exception to log. */ - private void logNetworkException(VDSNetworkException e) { + @Override + public void logNetworkException(VDSNetworkException e) { switch (_vds.getStatus()) { case Down: break; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java index fc08f89..e7760ee 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManagerFacade.java @@ -6,6 +6,7 @@ import org.ovirt.engine.core.common.businessentities.VdsStatistics; import org.ovirt.engine.core.common.businessentities.VmDynamic; import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSNetworkException; +import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSRecoveringException; import java.util.concurrent.atomic.AtomicBoolean; @@ -20,6 +21,8 @@ boolean isMonitoringNeeded(); + void handleVdsRecoveringException(VDSRecoveringException ex); + void updateDynamicData(VdsDynamic dynamicData); void updateStatisticsData(VdsStatistics statisticsData); @@ -31,4 +34,6 @@ VDSStatus refreshCapabilities(AtomicBoolean processHardwareCapsNeeded, VDS vds); boolean handleNetworkException(VDSNetworkException ex, VDS vds); + + void logNetworkException(VDSNetworkException e); } -- To view, visit http://gerrit.ovirt.org/27376 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a3d406c4f65ba7f437c699c97908f531e89d4d7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
