You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/02/07 08:43:57 UTC
[50/50] [abbrv] git commit: refs/heads/master - CLOUDSTACK-1178:DB
Commit warning logged for every Deploy VM request
Updated Branches:
refs/heads/gslb c08d151e0 -> 8f70ee08e
refs/heads/master eea74f5dd -> a71fb83c7
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/a71fb83c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a71fb83c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a71fb83c
Branch: refs/heads/master
Commit: a71fb83c779248f3065a16b3a82bd940e6930496
Parents: eea74f5
Author: Murali Reddy <mu...@citrix.com>
Authored: Thu Feb 7 11:28:42 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Thu Feb 7 13:12:37 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/a71fb83c/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) {