Gilad Chaplik has uploaded a new change for review. Change subject: core: scheduling: fix ClassCastException ......................................................................
core: scheduling: fix ClassCastException Since the external scheduler balance command returns Host id as LinkedList and the migrate command expects ArrayList the exception occurs. Change-Id: I011d1d01b6d2de1718a73f687ed6d181ccadb135 Bug-Url: https://bugzilla.redhat.com/1002093 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/MigrationHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/18802/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index 880d27c..3886002 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; import java.util.ArrayList; +import java.util.List; import javax.annotation.PostConstruct; import javax.ejb.DependsOn; @@ -51,9 +52,9 @@ SchedulingManager.getInstance().setMigrationHandler(new MigrationHandler() { @Override - public void migrateVM(ArrayList<Guid> initialHosts, Guid vmToMigrate) { + public void migrateVM(List<Guid> initialHosts, Guid vmToMigrate) { MigrateVmParameters parameters = new MigrateVmParameters(false, vmToMigrate); - parameters.setInitialHosts(initialHosts); + parameters.setInitialHosts(new ArrayList<Guid>(initialHosts)); Backend.getInstance().runInternalAction(VdcActionType.MigrateVm, parameters, ExecutionHandler.createInternalJobContext()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/MigrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/MigrationHandler.java index 8c35545..3eadb55 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/MigrationHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/MigrationHandler.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.scheduling; -import java.util.ArrayList; +import java.util.List; import org.ovirt.engine.core.compat.Guid; @@ -10,5 +10,5 @@ * @param initialHosts * @param vmToMigrate */ - void migrateVM(ArrayList<Guid> initialHosts, Guid vmToMigrate); + void migrateVM(List<Guid> initialHosts, Guid vmToMigrate); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java index 0ef33c5..c31b91e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java @@ -606,7 +606,7 @@ } if (balanceResult != null && balanceResult.getSecond() != null) { - migrationHandler.migrateVM((ArrayList<Guid>) balanceResult.getFirst(), balanceResult.getSecond()); + migrationHandler.migrateVM(balanceResult.getFirst(), balanceResult.getSecond()); } } } -- To view, visit http://gerrit.ovirt.org/18802 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I011d1d01b6d2de1718a73f687ed6d181ccadb135 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
