Updated Branches: refs/heads/4.1 6768f0d1c -> 18bf69696
CLOUDSTACK-1178:DB Commit warning logged for every Deploy VM request removing the regression that introduced premature transaction commit Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/18bf6969 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/18bf6969 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/18bf6969 Branch: refs/heads/4.1 Commit: 18bf69696cf176678132b602bcd3e36500fd6774 Parents: 6768f0d Author: Murali Reddy <[email protected]> Authored: Thu Feb 7 11:28:42 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Thu Feb 7 13:20:41 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/18bf6969/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 390a2a2..662dab3 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3358,9 +3358,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use _vmDao.persist(vm); _vmDao.saveDetails(vm); - txn.commit(); - s_logger.debug("Allocating in the DB for vm"); DataCenterDeployment plan = new DataCenterDeployment(zone.getId()); @@ -3395,7 +3393,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.user_vm); + txn.commit(); + // Assign instance to the group try { if (group != null) {
