Aias00 opened a new issue, #6465:
URL: https://github.com/apache/shenyu/issues/6465
### Is there an existing issue for this?
- [x] I have searched the existing issues
### Current Behavior
Namespace import remaps exported discovery handler ids to target-namespace
handler ids in `DiscoveryServiceImpl#importData(...)`:
```java
discoveryHandlerIdMapping.put(discoveryHandlerDO.getId(),
discoveryHandlerId);
discoveryHandlerDO.setId(discoveryHandlerId);
```
But `DiscoveryUpstreamServiceImpl#importData(...)` checks duplicate upstream
URLs before applying that mapping:
```java
String discoveryHandlerId = discoveryUpstreamDTO.getDiscoveryHandlerId();
Set<String> existsUpstreamUrlSet = discoveryHandlerUpstreamMap
.getOrDefault(discoveryHandlerId, Lists.newArrayList())
.stream()
.map(DiscoveryUpstreamDO::getUpstreamUrl)
.collect(Collectors.toSet());
if (existsUpstreamUrlSet.contains(url)) {
...
continue;
}
discoveryUpstreamDTO.setDiscoveryHandlerId(discoveryHandlerIdMapping.get(discoveryUpstreamDTO.getDiscoveryHandlerId()));
discoveryUpstreamMapper.insert(discoveryUpstreamDO);
```
`discoveryHandlerUpstreamMap` is grouped by target database handler ids, but
the lookup uses the exported/source handler id. So an existing upstream under
the remapped target handler is not detected. The insert can then hit the
database unique key `(discovery_handler_id, upstream_url)`.
Because this import method is not transactional, a duplicate-key error can
also leave earlier imported upstream rows committed while later rows fail.
### Expected Behavior
The import flow should remap `discoveryHandlerId` before duplicate lookup
and insert, then check duplicates against the target handler id.
Imports should either skip/report duplicate upstreams consistently or run in
a transaction so partial imports are not left behind after an insert failure.
### Steps To Reproduce
1. Export/import discovery data into a namespace where the corresponding
target discovery handler already has one of the upstream URLs.
2. During import, `DiscoveryServiceImpl` maps the exported handler id to a
new target handler id.
3. `DiscoveryUpstreamServiceImpl#importData(...)` checks duplicates using
the old exported handler id, so it does not see the existing target row.
4. The insert uses the remapped target handler id and can violate
`UNIQUE(discovery_handler_id, upstream_url)`.
### Environment
```markdown
ShenYu version(s): current master
```
### Debug logs
_No response_
### Anything else?
Relevant current-master files:
-
`shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java`
-
`shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java`
- `db/init/mysql/schema.sql`
--
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]
