yvsubhash commented on a change in pull request #1762: CLOUDSTACK-9595
Transactions are not getting retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#discussion_r158089016
##########
File path: server/src/com/cloud/network/IpAddressManagerImpl.java
##########
@@ -901,40 +916,28 @@ public PublicIp assignDedicateIpAddress(Account owner,
final Long guestNtwkId, f
PublicIp ip = null;
try {
- ip = Transaction.execute(new
TransactionCallbackWithException<PublicIp,
InsufficientAddressCapacityException>() {
- @Override
- public PublicIp doInTransaction(TransactionStatus status)
throws InsufficientAddressCapacityException {
- Account owner = _accountDao.acquireInLockTable(ownerId);
-
- if (owner == null) {
- // this ownerId comes from owner or type Account. See
the class "AccountVO" and the annotations in that class
- // to get the table name and field name that is
queried to fill this ownerid.
- ConcurrentOperationException ex = new
ConcurrentOperationException("Unable to lock account");
- throw ex;
- }
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("lock account " + ownerId + " is
acquired");
- }
- boolean displayIp = true;
- if (guestNtwkId != null) {
- Network ntwk = _networksDao.findById(guestNtwkId);
- displayIp = ntwk.getDisplayNetwork();
- } else if (vpcId != null) {
- VpcVO vpc = _vpcDao.findById(vpcId);
- displayIp = vpc.isDisplay();
- }
+ Account ownerAccount = _accountDao.acquireInLockTable(ownerId);
- PublicIp ip = fetchNewPublicIp(dcId, null, null, owner,
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId,
displayIp);
- IPAddressVO publicIp = ip.ip();
-
- markPublicIpAsAllocated(publicIp);
- _ipAddressDao.update(publicIp.getId(), publicIp);
+ if (ownerAccount == null) {
+ // this ownerId comes from owner or type Account. See the
class "AccountVO" and the annotations in that class
+ // to get the table name and field name that is queried to
fill this ownerid.
+ ConcurrentOperationException ex = new
ConcurrentOperationException("Unable to lock account");
+ throw ex;
+ }
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("lock account " + ownerId + " is acquired");
+ }
+ boolean displayIp = true;
+ if (guestNtwkId != null) {
+ Network ntwk = _networksDao.findById(guestNtwkId);
+ displayIp = ntwk.getDisplayNetwork();
+ } else if (vpcId != null) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ displayIp = vpc.isDisplay();
+ }
- return ip;
- }
- });
+ return fetchNewPublicIp(dcId, null, null, owner,
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId,
displayIp);
Review comment:
@rhtyd Passing true to fetchNewPublicIp went in as a separate commit
internally and got missed out while moving to ACS.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
