agama-project / agama / 16464057835

74%

Build Type

push

github

Committed by web-flow

Commit Message

nm/client: fix deactivate_connection() race (#2582)

## Problem

There was a potential race condition where the ActiveConnection could be
removed directly after the call to `nm_proxy.active_connections()`.

## Solution

This situation should not throw an error but instead return `Ok(None)`,
as it's not fatal and the caller can handle it gracefully.

It's seems to be similar to the error handling here
https://github.com/agama-project/agama/blob/9d76c6780/rust/agama-network/src/nm/client.rs#L395
but one step before.


## Testing

- *Tested manually*

- The issue was discovered by one out of 10 runs on migrating an
OvsBridge from wicked to Networkmanager
https://github.com/openSUSE/wicked2nm/pull/33
  To reproduce, one can run this inside the `wicked2nm` repo:
  ```bash
  cd tests;
  cnt=0; err=0; 
  while true; do 
    ((cnt++)); 
    ./test.sh --nm-cleanup ovs-bridge2.1 || ((err++)); 
    echo "cnt:$cnt err:$err"; 
    sleep 2; 
  done
  ```
  The error message looks like:
  ```
[ERROR] Migration failed: Could not update the network configuration:
D-Bus service error: org.freedesktop.DBus.Error.UnknownMethod: Object
does not exist at path
“/org/freedesktop/NetworkManager/ActiveConnection/690”
  ```

Run Details

2135 of 3882 branches covered (55.0%)

Branch coverage included in aggregate %.

0 of 7 new or added lines in 1 file covered. (0.0%)

1 existing line in 1 file now uncovered.

24799 of 38051 relevant lines covered (65.17%)

48.94 hits per line