From c13374fc092a726df5990276d132a1bb972e59e2 Mon Sep 17 00:00:00 2001 From: stag7824 Date: Tue, 17 Nov 2026 15:18:40 +0100 Subject: [PATCH] engine/schema: tolerate a detail name stored twice when listing key pairs listDetailsKeyPairs(resourceId, keys) and listDetailsKeyPairsWithVisibility collected the rows with Collectors.toMap without a merge function, so a resource with two rows of the same name made the call throw IllegalStateException. listDetailsKeyPairs(resourceId) already keeps the last value in that case; do the same here. Fixes #14709 --- .../ResourceDetailsDaoBase.java | 5 +- .../ResourceDetailsDaoBaseTest.java | 46 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java index 8f376a71f66f..dbc0d69d1354 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java @@ -122,7 +122,8 @@ public Map listDetailsKeyPairs(long resourceId, List key sc.setParameters("name", keys.toArray()); List results = search(sc, null); - return results.stream().collect(Collectors.toMap(R::getName, R::getValue)); + // Like listDetailsKeyPairs(long), a name stored more than once keeps the last value instead of failing + return results.stream().collect(Collectors.toMap(R::getName, R::getValue, (first, second) -> second)); } public Map listDetailsVisibility(long resourceId) { @@ -145,7 +146,7 @@ public Pair, Map> listDetailsKeyPairsWithVis Map> partitioned = results.stream() .collect(Collectors.partitioningBy( R::isDisplay, - Collectors.toMap(R::getName, R::getValue) + Collectors.toMap(R::getName, R::getValue, (first, second) -> second) )); return new Pair<>(partitioned.get(true), partitioned.get(false)); } diff --git a/engine/schema/src/test/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBaseTest.java b/engine/schema/src/test/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBaseTest.java index 4c54599c396c..365d9623a02c 100644 --- a/engine/schema/src/test/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBaseTest.java +++ b/engine/schema/src/test/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBaseTest.java @@ -46,6 +46,7 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; +import com.cloud.utils.Pair; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -108,6 +109,51 @@ public void testListDetailsKeyPairsEmptyResult() { assertTrue(result.isEmpty()); } + private TestDetailVO mockDetail(String name, String value, boolean display) { + TestDetailVO detail = mock(TestDetailVO.class); + when(detail.getName()).thenReturn(name); + when(detail.getValue()).thenReturn(value); + when(detail.isDisplay()).thenReturn(display); + return detail; + } + + @Test + public void testListDetailsKeyPairsWithNameStoredTwice() { + // A VM can end up with two kvm.vnc.address rows, which made the console endpoint fail with "Duplicate key" + List mockResults = Arrays.asList(mockDetail("kvm.vnc.address", "10.0.0.1", true), + mockDetail("kvm.vnc.port", "5900", true), mockDetail("kvm.vnc.address", "10.0.0.1", true)); + doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull()); + + Map result = testDetailsDao.listDetailsKeyPairs(1L, Arrays.asList("kvm.vnc.address", "kvm.vnc.port")); + + assertEquals(2, result.size()); + assertEquals("10.0.0.1", result.get("kvm.vnc.address")); + assertEquals("5900", result.get("kvm.vnc.port")); + } + + @Test + public void testListDetailsKeyPairsKeepsLastValueOfNameStoredTwice() { + List mockResults = Arrays.asList(mockDetail("key1", "old", true), mockDetail("key1", "new", true)); + doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull()); + + Map result = testDetailsDao.listDetailsKeyPairs(1L, Arrays.asList("key1")); + + assertEquals("new", result.get("key1")); + } + + @Test + public void testListDetailsKeyPairsWithVisibilityWithNameStoredTwice() { + List mockResults = Arrays.asList(mockDetail("key1", "old", true), mockDetail("key2", "value2", false), + mockDetail("key1", "new", true)); + doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull()); + + Pair, Map> result = testDetailsDao.listDetailsKeyPairsWithVisibility(1L); + + assertEquals(1, result.first().size()); + assertEquals("new", result.first().get("key1")); + assertEquals("value2", result.second().get("key2")); + } + protected static class TestDetailsDao extends ResourceDetailsDaoBase { @Override public void addDetail(long resourceId, String key, String value, boolean display) {