From d87711f20ea6491c42e80826c4e73e5a2b3ab603 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 27 Aug 2012 20:23:50 +0530 Subject: [PATCH] Some more commands with improper transactions reviewed-by: Marvin --- .../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 3 ++- .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index 361f029cc9d..1b6fc1811e9 100644 --- a/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/agent-simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -588,10 +588,10 @@ public class MockStorageManagerImpl implements MockStorageManager { return new GetStorageStatsAnswer(cmd, "Can't find the secondary storage:" + secUrl); } Long totalUsed = _mockVolumeDao.findTotalStorageId(secondary.getId()); + txn.commit(); return new GetStorageStatsAnswer(cmd, secondary.getCapacity(), totalUsed); } else { MockStoragePoolVO pool = _mockStoragePoolDao.findByUuid(uuid); - txn.commit(); if (pool == null) { return new GetStorageStatsAnswer(cmd, "Can't find the pool"); } @@ -599,6 +599,7 @@ public class MockStorageManagerImpl implements MockStorageManager { if (totalUsed == null) { totalUsed = 0L; } + txn.commit(); return new GetStorageStatsAnswer(cmd, pool.getCapacity(), totalUsed); } } catch (Exception ex) { diff --git a/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java index b848b00d58c..4b3e5eb7961 100644 --- a/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -149,7 +149,7 @@ public class SimulatorManagerImpl implements SimulatorManager { @DB @Override public Answer simulate(Command cmd, String hostGuid) { - Transaction txn = Transaction.currentTxn(); + Transaction txn = Transaction.open(Transaction.SIMULATOR_DB); txn.transitToUserManagedConnection(_concierge.conn()); try {