etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from shapeblue/dbconn 

SUPPORT-69: Async Job Database Connection Timeouts, connection refresh
This commit is contained in:
Abhinandan Prateek 2016-07-12 14:55:58 +05:30 committed by GitHub
parent 5f5c928c0f 2fe7ccfaca
commit bfec958177
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
View File

@ -48,6 +48,7 @@ import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
@ -512,6 +513,8 @@ public class VolumeObject implements VolumeInfo {
@Override
public void processEvent(ObjectInDataStoreStateMachine.Event event, Answer answer) {
try {
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.checkConnection();
if (dataStore.getRole() == DataStoreRole.Primary) {
if (answer instanceof CopyCmdAnswer) {
CopyCmdAnswer cpyAnswer = (CopyCmdAnswer)answer;