Skip to content
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

Jump to bottom

[WFCORE-2608]: /deployment-overlay=test:redeploy-links doesn't work in mixed domain. #2300

Merged
merged 1 commit into from
Apr 6, 2017
Merged

[WFCORE-2608]: /deployment-overlay=test:redeploy-links doesn't work in mixed domain. #2300

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions server/src/main/java/org/jboss/as/server/deploymentoverlay/AffectedDeploymentOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ public static void redeployLinksAndTransformOperationForDomain(OperationContext
}
if (deploymentPerServerGroup.isEmpty()) {
runtimeNames.forEach(s -> ServerLogger.ROOT_LOGGER.debugf("We haven't found any server-group for %s", s));
return;
}
Operations.CompositeOperationBuilder opBuilder = Operations.CompositeOperationBuilder.create();
if(removeOperation != null) {
Expand Down Expand Up @@ -190,11 +189,10 @@ public static void redeployLinksAndTransformOperationForDomain(OperationContext
*/
public static void redeployLinksAndTransformOperation(OperationContext context, ModelNode removeOperation, PathAddress deploymentsRootAddress, Set<String> runtimeNames) throws OperationFailedException {
Set<String> deploymentNames = listDeployments(context.readResourceFromRoot(deploymentsRootAddress), runtimeNames);
Operations.CompositeOperationBuilder opBuilder = Operations.CompositeOperationBuilder.create();
if (deploymentNames.isEmpty()) {
runtimeNames.forEach(s -> ServerLogger.ROOT_LOGGER.debugf("We haven't found any deployment for %s in server-group %s", s, deploymentsRootAddress.getLastElement().getValue()));
return;
}
Operations.CompositeOperationBuilder opBuilder = Operations.CompositeOperationBuilder.create();
if(removeOperation != null) {
opBuilder.addStep(removeOperation);
}
Expand Down Expand Up @@ -299,7 +297,7 @@ protected boolean matches(final ModelNode operation) {
}

private boolean validOverlay(PathAddress operationAddress) {
if (operationAddress.size() > 1 && operationAddress.size() >= overlayAddress.size()) {
if (operationAddress.size() >= 1 && operationAddress.size() >= overlayAddress.size()) {
ServerLogger.AS_ROOT_LOGGER.debugf("Comparing address %s with %s", operationAddress.subAddress(0, overlayAddress.size()).toCLIStyleString(), overlayAddress.toCLIStyleString());
return operationAddress.subAddress(0, overlayAddress.size()).equals(overlayAddress);
}
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/jboss/as/test/integration/domain/management/util/DomainTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static WildFlyManagedConfiguration getMasterConfiguration(String domainCo
public static WildFlyManagedConfiguration getMasterConfiguration(String domainConfigPath, String hostConfigPath,
String testName, WildFlyManagedConfiguration baseConfig,
boolean readOnlyDomain, boolean readOnlyHost) {
return getMasterConfiguration(domainConfigPath, hostConfigPath, testName, baseConfig, readOnlyDomain, readOnlyHost, false);
return getMasterConfiguration(domainConfigPath, hostConfigPath, testName, baseConfig, readOnlyDomain, readOnlyHost, Boolean.getBoolean("wildfly.master.debug"));
}

public static WildFlyManagedConfiguration getMasterConfiguration(String domainConfigPath, String hostConfigPath,
Expand All @@ -146,7 +146,7 @@ public static WildFlyManagedConfiguration getSlaveConfiguration(String hostConfi
public static WildFlyManagedConfiguration getSlaveConfiguration(String hostName, String hostConfigPath, String testName,
WildFlyManagedConfiguration baseConfig,
boolean readOnlyHost) {
return getSlaveConfiguration(hostName, hostConfigPath, testName, baseConfig, readOnlyHost, false);
return getSlaveConfiguration(hostName, hostConfigPath, testName, baseConfig, readOnlyHost, Boolean.getBoolean("wildfly.slave.debug"));
}

public static WildFlyManagedConfiguration getSlaveConfiguration(String hostName, String hostConfigPath, String testName,
Expand Down