Skip to content

CLOUDSTACK-9708: Router deployment failed due to two threads start VR simultaneously.#1870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karuturi merged 1 commit into from May 16, 2017
Merged

CLOUDSTACK-9708: Router deployment failed due to two threads start VR simultaneously. #1870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,18 @@ void init() {
JoinBuilder.JoinType.INNER);
AccountDataCenterVirtualSearch.done();

SearchBuilder<NicVO> nicSearchByNetwork = _nicDao.createSearchBuilder();

@yadvryadvrAug 3, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nitin-maharana while your fix may be valid, it seems to be breaking some test_nic and test_routers test cases. The issue seems to be another nicSearch on line 184 which perhaps is used in most cases. You may remove nicSearchByNetwork which is not useful or used at all depending on the original code when UserVmSearch is null or not, when calling the method listByNetworkIdAndStates. Depending on the test results, I may revert your original fix, but kindly re-submit a newer change and I can help run tests for you. Thanks.

@nitin-maharananitin-maharanaAug 4, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhtyd: Perfect! Thanks for finding out. I will submit a new pull request with the proper fix.

nicSearchByNetwork.and("networkId", nicSearchByNetwork.entity().getNetworkId(), SearchCriteria.Op.EQ);
nicSearchByNetwork.and("removed", nicSearchByNetwork.entity().getRemoved(), SearchCriteria.Op.NULL);
nicSearchByNetwork.and().op("ip4Address", nicSearchByNetwork.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
nicSearchByNetwork.or("ip6Address", nicSearchByNetwork.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
nicSearchByNetwork.cp();

UserVmSearch = createSearchBuilder();
UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN);
UserVmSearch.join("nicSearchByNetwork", nicSearchByNetwork, UserVmSearch.entity().getId(), nicSearchByNetwork.entity().getInstanceId(), JoinBuilder.JoinType.INNER);
UserVmSearch.done();

UserVmByIsoSearch = createSearchBuilder();
UserVmByIsoSearch.and("isoId", UserVmByIsoSearch.entity().getIsoId(), SearchCriteria.Op.EQ);
UserVmByIsoSearch.done();
Expand DownExpand Up@@ -301,25 +313,11 @@ public List<UserVmVO> listVirtualNetworkInstancesByAcctAndNetwork(long accountId

@Override
public List<UserVmVO> listByNetworkIdAndStates(long networkId, State... states) {
if (UserVmSearch == null) {
SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
nicSearch.and().op("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
nicSearch.or("ip6Address", nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
nicSearch.cp();

UserVmSearch = createSearchBuilder();
UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN);
UserVmSearch.join("nicSearch", nicSearch, UserVmSearch.entity().getId(), nicSearch.entity().getInstanceId(), JoinBuilder.JoinType.INNER);
UserVmSearch.done();
}

SearchCriteria<UserVmVO> sc = UserVmSearch.create();
if (states != null && states.length != 0) {
sc.setParameters("states", (Object[])states);
}
sc.setJoinParameters("nicSearch", "networkId", networkId);
sc.setJoinParameters("nicSearchByNetwork", "networkId", networkId);

return listBy(sc);
}
Expand Down