CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
- Changes to the API Cmd needed to use CallContext instead of UserContext Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/686f9ae6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/686f9ae6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/686f9ae6 Branch: refs/heads/ldapplugin Commit: 686f9ae64fbf628cf96696c119d4170ea263def4 Parents: aa13152 Author: Prachi Damle <[email protected]> Authored: Tue Jul 16 13:17:43 2013 -0700 Committer: Prachi Damle <[email protected]> Committed: Tue Jul 16 13:17:43 2013 -0700 ---------------------------------------------------------------------- .../api/command/admin/resource/CleanVMReservationsCmd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/686f9ae6/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java index b0be7b2..2000edb 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java @@ -22,10 +22,10 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.log4j.Logger; - +import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; import com.cloud.user.Account; -import com.cloud.user.UserContext; + @APICommand(name = "cleanVMReservations", description = "Cleanups VM reservations in the database.", responseObject = SuccessResponse.class) public class CleanVMReservationsCmd extends BaseAsyncCmd { @@ -49,7 +49,7 @@ public class CleanVMReservationsCmd extends BaseAsyncCmd { @Override public long getEntityOwnerId() { - Account account = UserContext.current().getCaller(); + Account account = CallContext.current().getCallingAccount(); if (account != null) { return account.getId(); }
