cleanup VM IP after expunge in redundant VPC#10183
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 4.19 #10183 +/- ##
============================================
+ Coverage 15.13% 15.21% +0.08%
- Complexity 11272 11454 +182
============================================
Files 5408 5409 +1
Lines 473958 484517 +10559
Branches 57811 62220 +4409
============================================
+ Hits 71721 73707 +1986
- Misses 394219 402573 +8354
- Partials 8018 8237 +219
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
@blueorangutan test |
|
@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-12134)
|
|
@weizhouapache unfortunately this didn't work. the address is removed from the primary VR but not from the backup. |
|
btw, I will test in 4.19-head without this to see what behaviour is there. |
|
@Pearl1594 , you tested right? |
| sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer | ||
| sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer | ||
|
|
||
| sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf |
There was a problem hiding this comment.
just curious, this setting does not exist in VR of isolated networks as well
root@r-1171-VM:~# grep -r dnsmasq.leases /etc/dnsmasq*
/etc/dnsmasq.conf:#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
/etc/dnsmasq.conf.tmpl:#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
Does the issue exist with redundant VRs of isolated network as well ?
There was a problem hiding this comment.
good point @weizhouapache . Let's test that as well.
There was a problem hiding this comment.
good call @weizhouapache in the redundant isolated VR the issue remains. cc @Pearl1594
There was a problem hiding this comment.
added, but now I will have to look at shared networks as well, don't I?
There was a problem hiding this comment.
maybe not needed, as redundant VRs are not supported
There was a problem hiding this comment.
no, but the script is not only for redundant VRs. I'd like to give it a bash anyway.
There was a problem hiding this comment.
this fails for isolated VRs :(
There was a problem hiding this comment.
note that after expunging the second VM both entries disappeared.
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12314 |
|
@weizhouapache @Pearl1594 , I think we can merge this as it does improve it for the issue reporter, but we are not done for redundant isolated networks, after this. |
|
@Pearl1594 @DaanHoogland |
@weizhouapache Do you mean update the dnsmasq.conf file content in CsDhcp.py? or restart of the dnsmasq service? |
|
I tested 4.20 with the CsDhcp.py change, both redundant network and redundant VPC look good |
|
is it consistent @weizhouapache . I dnoticed that the csdhcp.py change doesnt consistently cleanup the dnsmasq.leases file |
I tested deletion of 4 vms, all are removed from /var/lib/misc/dnsmasq.leases |
|
so we don´t leave the changes in the router setup scripts in, @weizhouapache ? cc @Pearl1594 |
from my testing result, right, no need to update the sh scripts. |
|
@blueorangutan package |
|
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12366 |
|
@blueorangutan test |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-12338)
|
Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>







Description
This PR...
Fixes: #10182
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?