Skip to content

fixes resource group IT #6233

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

Open
keith-turner wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −6
Open

fixes resource group IT #6233

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
28 changes: 22 additions & 6 deletions test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,9 @@ public void testPermissions() throws Exception {
@Test
public void testMultipleProperties() throws Exception {

final String FIRST = "FIRST";
final String SECOND = "SECOND";
final String THIRD = "THIRD";
final String FIRST = "FIRST_MP";
final String SECOND = "SECOND_MP";
final String THIRD = "THIRD_MP";

final ResourceGroupId first = ResourceGroupId.of(FIRST);
final ResourceGroupId second = ResourceGroupId.of(SECOND);
Expand Down Expand Up @@ -356,6 +356,10 @@ public void testMultipleProperties() throws Exception {
rgops.create(second);
rgops.create(third);

assertEquals(Map.of(), rgops.getProperties(first));
assertEquals(Map.of(), rgops.getProperties(second));
assertEquals(Map.of(), rgops.getProperties(third));

rgops.modifyProperties(first, (map) -> map.putAll(firstProps));
rgops.modifyProperties(second, (map) -> map.putAll(secondProps));
rgops.modifyProperties(third, (map) -> map.putAll(thirdProps));
Expand All @@ -381,15 +385,18 @@ public void testMultipleProperties() throws Exception {
assertEquals(defaultProps, rgops.getProperties(ResourceGroupId.DEFAULT));
assertThrows(ResourceGroupNotFoundException.class, ()->rgops.getProperties(third));
assertEquals(Set.of(ResourceGroupId.DEFAULT, first, second), rgops.list());

rgops.remove(first);
rgops.remove(second);
}
}

@Test
public void testMultipleConfigurations() throws Exception {

final String FIRST = "FIRST";
final String SECOND = "SECOND";
final String THIRD = "THIRD";
final String FIRST = "FIRST_MC";
final String SECOND = "SECOND_MC";
final String THIRD = "THIRD_MC";

final ResourceGroupId first = ResourceGroupId.of(FIRST);
final ResourceGroupId second = ResourceGroupId.of(SECOND);
Expand Down Expand Up @@ -436,6 +443,10 @@ public void testMultipleConfigurations() throws Exception {
rgops.create(second);
rgops.create(third);

assertEquals(Map.of(), rgops.getProperties(first));
assertEquals(Map.of(), rgops.getProperties(second));
assertEquals(Map.of(), rgops.getProperties(third));

getCluster().getConfig().getClusterServerConfiguration().setNumDefaultCompactors(1);
getCluster().getConfig().getClusterServerConfiguration().addCompactorResourceGroup(FIRST, 1);
getCluster().getConfig().getClusterServerConfiguration().addCompactorResourceGroup(SECOND, 1);
Expand Down Expand Up @@ -497,6 +508,11 @@ public void testMultipleConfigurations() throws Exception {
Wait.waitFor(() -> cc.getServerPaths()
.getTabletServer(ResourceGroupPredicate.exact(third), AddressSelector.all(), true).size()
== 0);

rgops.remove(first);
rgops.remove(second);
rgops.remove(third);

}
}

Expand Down