cleanup VM IP after expunge in redundant VPC #10183

DaanHoogland · 2025-01-14T10:07:26Z

Description

This PR...

Fixes: #10182

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
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

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2025-01-14T10:13:46Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 15.21%. Comparing base (35fe19f) to head (72a370e).
Report is 55 commits behind head on 4.19.

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

Flag	Coverage Δ
uitests	`4.82% <ø> (+0.52%)`	⬆️
unittests	`15.90% <ø> (+0.05%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

systemvm/debian/opt/cloud/bin/cs/CsDhcp.py

weizhouapache · 2025-01-14T18:55:08Z

@blueorangutan test

blueorangutan · 2025-01-14T18:56:04Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-01-21T02:16:05Z

[SF] Trillian test result (tid-12134)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 51304 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10183-t12134-kvm-ol8.zip
Smoke tests completed. 133 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

weizhouapache

code lgtm

Pearl1594

code LGTM

DaanHoogland · 2025-01-31T14:41:53Z

@weizhouapache unfortunately this didn't work. the address is removed from the primary VR but not from the backup.

DaanHoogland · 2025-01-31T14:42:49Z

btw, I will test in 4.19-head without this to see what behaviour is there.

DaanHoogland · 2025-01-31T15:03:19Z

also

instead of

which seems a bit of a regression :(

DaanHoogland

looks good

DaanHoogland · 2025-02-01T07:41:38Z

@Pearl1594 , you tested right?

weizhouapache · 2025-02-03T10:48:04Z

systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh

  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


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 ?

good point @weizhouapache . Let's test that as well.

good call @weizhouapache in the redundant isolated VR the issue remains. cc @Pearl1594

added, but now I will have to look at shared networks as well, don't I?

maybe not needed, as redundant VRs are not supported

no, but the script is not only for redundant VRs. I'd like to give it a bash anyway.

this fails for isolated VRs :(

so to specify, it does not fail for shared networks, it fails for redundant isolated networks.
backup router:

primary:

note that after expunging the second VM both entries disappeared.

blueorangutan · 2025-02-03T14:56:38Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12314

DaanHoogland · 2025-02-04T16:10:32Z

@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.

weizhouapache · 2025-02-04T18:16:16Z

@Pearl1594 @DaanHoogland
Can we configure it in CsDhcp.py ?

Pearl1594 · 2025-02-05T15:04:14Z

@Pearl1594 @DaanHoogland Can we configure it in CsDhcp.py ?

@weizhouapache Do you mean update the dnsmasq.conf file content in CsDhcp.py? or restart of the dnsmasq service?

weizhouapache · 2025-02-06T07:59:23Z

I tested 4.20 with the CsDhcp.py change, both redundant network and redundant VPC look good

@DaanHoogland @Pearl1594

Pearl1594 · 2025-02-06T11:45:04Z

is it consistent @weizhouapache . I dnoticed that the csdhcp.py change doesnt consistently cleanup the dnsmasq.leases file

weizhouapache · 2025-02-06T13:02:33Z

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

DaanHoogland · 2025-02-06T13:17:51Z

so we don´t leave the changes in the router setup scripts in, @weizhouapache ? cc @Pearl1594

weizhouapache · 2025-02-06T13:28:07Z

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.
if you have time, please test and share your results
cc @Pearl1594 @DaanHoogland

systemvm/debian/opt/cloud/bin/setup/router.sh

systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh

DaanHoogland · 2025-02-06T15:30:53Z

@blueorangutan package

blueorangutan · 2025-02-06T15:32:03Z

@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.

sonarqubecloud · 2025-02-06T16:11:11Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

blueorangutan · 2025-02-06T16:32:29Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12366

DaanHoogland · 2025-02-07T08:16:17Z

@blueorangutan test

blueorangutan · 2025-02-07T08:18:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-02-07T21:11:30Z

[SF] Trillian test result (tid-12338)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 43949 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10183-t12338-kvm-ol8.zip
Smoke tests completed. 133 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

Co-authored-by: Pearl Dsilva <[email protected]>

add workaround from issue reporter

3b1a83a

DaanHoogland added the component:networking label Jan 14, 2025

DaanHoogland added this to the 4.19.2 milestone Jan 14, 2025

boring-cyborg bot added component:virtual-router Python Warning... Python code Ahead! labels Jan 14, 2025

DaanHoogland added the status:needs-testing label Jan 14, 2025

DaanHoogland linked an issue Jan 14, 2025 that may be closed by this pull request

Expunge vm not release in-memory dhcp record in vpc redundant virtual route correctly #10182

Closed

DaanHoogland mentioned this pull request Jan 14, 2025

Expunge vm not release in-memory dhcp record in vpc redundant virtual route correctly #10182

Closed

DaanHoogland changed the title ~~add workaround from issue reporter~~ cleanup VM IP after expunge in redundant VPC Jan 14, 2025

weizhouapache reviewed Jan 14, 2025

View reviewed changes

systemvm/debian/opt/cloud/bin/cs/CsDhcp.py Outdated Show resolved Hide resolved

DaanHoogland commented Jan 14, 2025

View reviewed changes

systemvm/debian/opt/cloud/bin/cs/CsDhcp.py Outdated Show resolved Hide resolved

Update systemvm/debian/opt/cloud/bin/cs/CsDhcp.py

ecb725f

weizhouapache approved these changes Jan 21, 2025

View reviewed changes

DaanHoogland marked this pull request as ready for review January 21, 2025 08:30

Pearl1594 approved these changes Jan 30, 2025

View reviewed changes

DaanHoogland self-assigned this Jan 31, 2025

uncomment dnsmasq leases file in conf

f4af74b

DaanHoogland commented Feb 1, 2025

View reviewed changes

weizhouapache self-requested a review February 1, 2025 07:47

weizhouapache reviewed Feb 3, 2025

View reviewed changes

uncomment dnsmasq leases file in conf for isolated router

c8a023b

apache deleted a comment from blueorangutan Feb 3, 2025

DaanHoogland removed their assignment Feb 5, 2025

DaanHoogland commented Feb 6, 2025

View reviewed changes

systemvm/debian/opt/cloud/bin/setup/router.sh Outdated Show resolved Hide resolved

DaanHoogland commented Feb 6, 2025

View reviewed changes

systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh Outdated Show resolved Hide resolved

Apply suggestions from code review

72a370e

DaanHoogland merged commit d453c63 into 4.19 Feb 9, 2025
49 of 50 checks passed

DaanHoogland deleted the 10182-expunge-vm branch February 9, 2025 08:34

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 19, 2025

cleanup VM IP after expunge in redundant VPC (apache#10183)

ac46cef

Co-authored-by: Pearl Dsilva <[email protected]>

weizhouapache mentioned this pull request Oct 21, 2025

Windows passwords cannot be set or reset when the system is on an isolated network with dual routers #11877

Open

cleanup VM IP after expunge in redundant VPC #10183

cleanup VM IP after expunge in redundant VPC #10183

Uh oh!

Conversation

DaanHoogland commented Jan 14, 2025

Description

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?

Uh oh!

codecov bot commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Jan 14, 2025

Uh oh!

blueorangutan commented Jan 14, 2025

Uh oh!

blueorangutan commented Jan 21, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jan 31, 2025

Uh oh!

DaanHoogland commented Jan 31, 2025

Uh oh!

DaanHoogland commented Jan 31, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Feb 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Feb 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Feb 3, 2025

Uh oh!

DaanHoogland commented Feb 4, 2025

Uh oh!

weizhouapache commented Feb 4, 2025

Uh oh!

Pearl1594 commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache commented Feb 6, 2025

Uh oh!

Pearl1594 commented Feb 6, 2025

Uh oh!

weizhouapache commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jan 14, 2025 •

edited

Loading

DaanHoogland commented Feb 1, 2025 •

edited

Loading

DaanHoogland Feb 4, 2025 •

edited

Loading

Pearl1594 commented Feb 5, 2025 •

edited

Loading

weizhouapache commented Feb 6, 2025 •

edited

Loading