Pearl1594 opened a new pull request, #14341: URL: https://github.com/apache/cloudstack/pull/14341
### Description This PR fixes 2 issues: 1. Removing a nic can silently close a different nic's still-open usage record : UsageNetworkOfferingDaoImpl.update()'s UPDATE_DELETED SQL matched on (account_id, vm_instance_id, network_offering_id) only - not nic_id. On a VM with two nics on two different networks that happen to share one network offering, removing one nic would also close the other nic's still-active usage row, silently under-billing it from that point on. Fixed by matching on the row's own primary key (id). 2. updateDefaultNicForVirtualMachine can wipe billing for the nic becoming default : The default-nic swap emits 4 usage events: REMOVE(old-default), ASSIGN(new-default), REMOVE(new-default's stale row), ASSIGN(old-default's new row), in that order. Because a default-nic swap never changes which network a nic is on, the 3rd call's REMOVE always collides with the row the 2nd call's ASSIGN just created (identical nic/offering/network, nothing to disambiguate by). The lookup can't tell the stale row from the brand-new one and closes both, leaving the nic becoming default with zero open billing until the VM's next full stop/start. Fixed by reordering to close-before-open per nic (REMOVE old, REMOVE new's stale row, ASSIGN new, ASSIGN old) <!--- Describe your changes in DETAIL - And how has behaviour functionally changed. --> <!-- For new features, provide link to FS, dev ML discussion etc. --> <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. --> <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged --> <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" --> <!-- Fixes: # --> <!--- ******************************************************************************* --> <!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. --> <!--- PLEASE PUT AN 'X' in only **ONE** box --> <!--- ******************************************************************************* --> ### Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [X] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) - [ ] Build/CI - [ ] Test (unit or integration test code) ### Feature/Enhancement Scale or Bug Severity #### Bug Severity - [ ] BLOCKER - [ ] Critical - [ ] Major - [X] Minor - [ ] Trivial ### Screenshots (if appropriate): ### How Has This Been Tested? <!-- Please describe in detail how you tested your changes. --> <!-- Include details of your testing environment, and the tests you ran to --> #### How did you try to break this feature and the system with this change? <!-- see how your change affects other areas of the code, etc. --> <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document --> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
