mirror of https://github.com/apache/cloudstack.git
bug 11910: during full sync ignoring VMs which have been into starting state shortly
reviewed-by: kishan
This commit is contained in:
parent
3cc37ed3fb
commit
02c97f90ce
|
|
@ -125,6 +125,7 @@ import com.cloud.user.User;
|
|||
import com.cloud.user.dao.AccountDao;
|
||||
import com.cloud.user.dao.UserDao;
|
||||
import com.cloud.uservm.UserVm;
|
||||
import com.cloud.utils.DateUtil;
|
||||
import com.cloud.utils.Journal;
|
||||
import com.cloud.utils.NumbersUtil;
|
||||
import com.cloud.utils.Pair;
|
||||
|
|
@ -1646,6 +1647,10 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
|
|||
AgentVmInfo info = infos.remove(vm.getId());
|
||||
VMInstanceVO castedVm = null;
|
||||
if (info == null) {
|
||||
// the vm is not there on cluster, check the vm status in DB
|
||||
if (vm.getState() == State.Starting && (DateUtil.currentGMTTime().getTime() - vm.getUpdateTime().getTime()) < 10*60*1000){
|
||||
continue; // ignoring this VM as it is still settling
|
||||
}
|
||||
info = new AgentVmInfo(vm.getInstanceName(), getVmGuru(vm), vm, State.Stopped);
|
||||
castedVm = info.guru.findById(vm.getId());
|
||||
hId = vm.getHostId() == null ? vm.getLastHostId() : vm.getHostId();
|
||||
|
|
|
|||
Loading…
Reference in New Issue