mirror of https://github.com/apache/cloudstack.git
bug 10587: correctly use transaction
status 10587: resolved fixed Conflicts: server/src/com/cloud/storage/StorageManagerImpl.java
This commit is contained in:
parent
a2531b60f9
commit
47296e64ac
|
|
@ -2039,9 +2039,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
|
|||
boolean restart = true;
|
||||
StoragePoolVO primaryStorage = null;
|
||||
try {
|
||||
Transaction txn = Transaction.currentTxn();
|
||||
txn.start();
|
||||
|
||||
// 1. Get the primary storage record and perform validation check
|
||||
primaryStorage = _storagePoolDao.lockRow(primaryStorageId, true);
|
||||
|
||||
|
|
@ -2098,9 +2095,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
|
|||
}
|
||||
}
|
||||
|
||||
txn.commit();
|
||||
txn.close();
|
||||
|
||||
// 4. Process the queue
|
||||
List<StoragePoolWorkVO> pendingWork = _storagePoolWorkDao.listPendingWorkForPrepareForMaintenanceByPoolId(primaryStorageId);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue