Skip to content

ARTEMIS-5892 Wrong queueConfigurations being exported #6224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
clebertsuconic wants to merge 1 commit into from
+25 −1
Closed

ARTEMIS-5892 Wrong queueConfigurations being exported #6224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ private void writeProperties(FileWriter writer) throws Exception {
// we cannot import a map<string,set<string>> property and this feature is only applied by the xml parser
"securityRoleNameMappings",
// another xml ism using a deprecated config object
"queueConfigs",
"queueConfigurations",
"encodeSize",
// duplicates
"federationPolicyMap", // core federation
Expand Down
24 changes: 24 additions & 0 deletions ...ver/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@

import org.apache.activemq.artemis.ArtemisConstants;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConfigurationUtils;
import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
import org.apache.activemq.artemis.core.config.LockCoordinatorConfiguration;
import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
Expand Down Expand Up @@ -3067,6 +3069,28 @@ public void testExportInvalidPropertyOnAcceptor() throws Exception {
assertEquals("", configuration.getAcceptorConfigurations().stream().findFirst().get().getCombinedParams().get("useKQueue"));
}


@Test
public void testInvalidPropertiesOnQueue() throws Exception {
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.addQueueConfiguration(QueueConfiguration.of("shouldNotBeHere"));

// useKQueue here would generate a hashMap Value null, what would break the exportAsProperties.
configuration.addAcceptorConfiguration("test", "tcp://0.0.0.0:61616?useKQueue");
configuration.addAddressConfiguration(new CoreAddressConfiguration().setName("test").addQueueConfiguration(QueueConfiguration.of("test").setAddress("test").setRingSize(777L).setRoutingType(RoutingType.ANYCAST)).addRoutingType(RoutingType.ANYCAST));
File fileOutput = new File(getTestDirfile(), "broker.properties");
assertDoesNotThrow(() -> configuration.exportAsProperties(fileOutput));
Properties properties = new Properties();
try (InputStream inStream = Files.newInputStream(fileOutput.toPath())) {
properties.load(inStream);
}
assertFalse(properties.isEmpty());
properties.forEach((a, b) -> {
assertFalse(String.valueOf(a).contains("queueConfigurations"));
assertFalse(String.valueOf(b).contains("shouldNotBeHere"));
});
}

/**
* Verifies the lock coordinator configuration parsing and export process:
* <ul>
Expand Down
Loading