DonalEvans commented on a change in pull request #6845:
URL: https://github.com/apache/geode/pull/6845#discussion_r705610747
##########
File path:
geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
##########
@@ -40,21 +43,73 @@
private final boolean isCritical;
private final boolean enforceLocalMaxMemory;
- Member(AddressComparor addressComparor, InternalDistributedMember memberId,
boolean isCritical,
+ @VisibleForTesting
+ public Member(AddressComparor addressComparor, InternalDistributedMember
memberId,
+ boolean isCritical,
boolean enforceLocalMaxMemory) {
this.addressComparor = addressComparor;
this.memberId = memberId;
this.isCritical = isCritical;
this.enforceLocalMaxMemory = enforceLocalMaxMemory;
}
- Member(AddressComparor addressComparor, InternalDistributedMember memberId,
float weight,
+ @VisibleForTesting
+ public Member(AddressComparor addressComparor, InternalDistributedMember
memberId, float weight,
long localMaxMemory, boolean isCritical, boolean enforceLocalMaxMemory) {
this(addressComparor, memberId, isCritical, enforceLocalMaxMemory);
this.weight = weight;
this.localMaxMemory = localMaxMemory;
}
+ /**
+ * Check to see if the member is the last copy of the bucket in the
redundancy zone
+ *
+ * @param bucket -- bucket to be deleted from the member
+ * @param distributionManager -- used to check members of redundancy zones
+ */
+
+ public RefusalReason canDelete(Bucket bucket, DistributionManager
distributionManager) {
+ // This code only applies to Clusters.
+ if (!(distributionManager instanceof ClusterDistributionManager)) {
+ return RefusalReason.NONE;
+ }
+
+ ClusterDistributionManager clstrDistrMgr = (ClusterDistributionManager)
distributionManager;
Review comment:
This cast is unnecessary, as the methods called on the distribution
manager exist on the interface.
##########
File path:
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
##########
@@ -0,0 +1,272 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy
zones
+ * is working correctly.
+ */
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceOperationComplexDistributedTest implements Serializable {
+ public static final int EXPECTED_BUCKET_COUNT = 113;
+ public static final long TIMEOUT_SECONDS =
GeodeAwaitility.getTimeout().getSeconds();
+ public static final String CLIENT_XML =
"RebalanceOperationComplex-client.xml";
+ public static final String SERVER_XML =
"RebalanceOperationComplex-server.xml";
+ public static final String REGION_NAME = "primary";
+ public static final String COLOCATED_REGION_NAME = "colocated";
+ public static final Logger logger = LogService.getLogger();
+
+ public static final String ZONE_A = "zoneA";
+ public static final String ZONE_B = "zoneB";
+ public int locatorPort;
+ public static final AtomicInteger runID = new AtomicInteger(0);
+ public String workingDir;
+
+ // 6 servers distributed evenly across 2 zones
+ public static final Map<Integer, String> SERVER_ZONE_MAP = new
HashMap<Integer, String>() {
+ {
+ put(1, ZONE_A);
+ put(2, ZONE_A);
+ put(3, ZONE_A);
+ put(4, ZONE_B);
+ put(5, ZONE_B);
+ put(6, ZONE_B);
+ }
+ };
+
+ @Rule
+ public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(8);
+
+ @Before
+ public void setup() {
+ // Start the locator
+ MemberVM locatorVM = clusterStartupRule.startLocatorVM(0);
+ locatorPort = locatorVM.getPort();
+
+ workingDir = clusterStartupRule.getWorkingDirRoot().getAbsolutePath();
+
+ runID.incrementAndGet();
+ cleanOutServerDirectories();
+ }
+
+ @After
+ public void after() {
+ stopServersAndDeleteDirectories();
+ }
+
+ /**
+ * Test that we correctly use the redundancy-zone property to determine
where to place redundant
+ * copies of a buckets and doesn't allow cross redundancy zone deletes.
+ *
+ * @param rebalanceServer - the server index that will initiate all the
rebalances
+ * @param serverToBeShutdownAndRestarted - the server index that will be
shutdown and restarted
+ */
+ @Test
+ @Parameters({"1,2", "1,4", "4,1", "5,6"})
+ public void testEnforceZoneWithSixServersAndTwoZones(int rebalanceServer,
+ int serverToBeShutdownAndRestarted)
+ throws Exception {
+
+ // Startup the servers
+ for (Map.Entry<Integer, String> entry : SERVER_ZONE_MAP.entrySet()) {
+ startServerInRedundancyZone(entry.getKey(), entry.getValue());
+ }
+
+ // Put data in the server regions
+ clientPopulateServers();
Review comment:
This could probably be moved to the `setUp()` method.
##########
File path:
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
##########
@@ -0,0 +1,272 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy
zones
+ * is working correctly.
+ */
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceOperationComplexDistributedTest implements Serializable {
+ public static final int EXPECTED_BUCKET_COUNT = 113;
+ public static final long TIMEOUT_SECONDS =
GeodeAwaitility.getTimeout().getSeconds();
+ public static final String CLIENT_XML =
"RebalanceOperationComplex-client.xml";
+ public static final String SERVER_XML =
"RebalanceOperationComplex-server.xml";
+ public static final String REGION_NAME = "primary";
+ public static final String COLOCATED_REGION_NAME = "colocated";
+ public static final Logger logger = LogService.getLogger();
+
+ public static final String ZONE_A = "zoneA";
+ public static final String ZONE_B = "zoneB";
+ public int locatorPort;
+ public static final AtomicInteger runID = new AtomicInteger(0);
+ public String workingDir;
+
+ // 6 servers distributed evenly across 2 zones
+ public static final Map<Integer, String> SERVER_ZONE_MAP = new
HashMap<Integer, String>() {
+ {
+ put(1, ZONE_A);
+ put(2, ZONE_A);
+ put(3, ZONE_A);
+ put(4, ZONE_B);
+ put(5, ZONE_B);
+ put(6, ZONE_B);
+ }
+ };
+
+ @Rule
+ public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(8);
+
+ @Before
+ public void setup() {
+ // Start the locator
+ MemberVM locatorVM = clusterStartupRule.startLocatorVM(0);
+ locatorPort = locatorVM.getPort();
+
+ workingDir = clusterStartupRule.getWorkingDirRoot().getAbsolutePath();
+
+ runID.incrementAndGet();
+ cleanOutServerDirectories();
+ }
+
+ @After
+ public void after() {
+ stopServersAndDeleteDirectories();
Review comment:
I think this may be unnecessary, as `ClusterStartupRule` takes care of
this clean-up.
##########
File path:
geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
##########
@@ -40,21 +43,73 @@
private final boolean isCritical;
private final boolean enforceLocalMaxMemory;
- Member(AddressComparor addressComparor, InternalDistributedMember memberId,
boolean isCritical,
+ @VisibleForTesting
+ public Member(AddressComparor addressComparor, InternalDistributedMember
memberId,
+ boolean isCritical,
boolean enforceLocalMaxMemory) {
this.addressComparor = addressComparor;
this.memberId = memberId;
this.isCritical = isCritical;
this.enforceLocalMaxMemory = enforceLocalMaxMemory;
}
- Member(AddressComparor addressComparor, InternalDistributedMember memberId,
float weight,
+ @VisibleForTesting
+ public Member(AddressComparor addressComparor, InternalDistributedMember
memberId, float weight,
long localMaxMemory, boolean isCritical, boolean enforceLocalMaxMemory) {
this(addressComparor, memberId, isCritical, enforceLocalMaxMemory);
this.weight = weight;
this.localMaxMemory = localMaxMemory;
}
+ /**
+ * Check to see if the member is the last copy of the bucket in the
redundancy zone
+ *
+ * @param bucket -- bucket to be deleted from the member
+ * @param distributionManager -- used to check members of redundancy zones
+ */
+
+ public RefusalReason canDelete(Bucket bucket, DistributionManager
distributionManager) {
+ // This code only applies to Clusters.
+ if (!(distributionManager instanceof ClusterDistributionManager)) {
+ return RefusalReason.NONE;
+ }
+
+ ClusterDistributionManager clstrDistrMgr = (ClusterDistributionManager)
distributionManager;
+ String myRedundancyZone = clstrDistrMgr.getRedundancyZone(memberId);
+ boolean lastMemberOfZone = true;
+
+ if (myRedundancyZone == null) {
+ // Not using redundancy zones, so...
+ return RefusalReason.NONE;
+ }
+
+ for (Member member : bucket.getMembersHosting()) {
+ // Don't look at yourself because you are not redundant for yourself
+ if (member.getMemberId().equals(this.getMemberId())) {
+ continue;
+ }
+
+ String memberRedundancyZone =
clstrDistrMgr.getRedundancyZone(member.memberId);
+ if (memberRedundancyZone == null) {
+ // Not using redundancy zones, so...
+ continue;
+ }
+
+ // Does the member redundancy zone match my redundancy zone?
+ // if so we are not the last in the redundancy zone.
+ if (memberRedundancyZone.equals(myRedundancyZone)) {
+ lastMemberOfZone = false;
Review comment:
Here we could instead just `return RefusalReason.NONE;` and eliminate
the `lastMemberOfZone` variable, since it will always be true if we exit the
loop without hitting this line.
##########
File path:
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
##########
@@ -0,0 +1,272 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy
zones
+ * is working correctly.
+ */
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceOperationComplexDistributedTest implements Serializable {
+ public static final int EXPECTED_BUCKET_COUNT = 113;
+ public static final long TIMEOUT_SECONDS =
GeodeAwaitility.getTimeout().getSeconds();
+ public static final String CLIENT_XML =
"RebalanceOperationComplex-client.xml";
+ public static final String SERVER_XML =
"RebalanceOperationComplex-server.xml";
Review comment:
Is there a specific reason for this test to be using cache.xml to setup
the client and servers? I believe it should be possible to achieve the same
results using API calls or GFSH, which are more commonly used.
##########
File path:
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
##########
@@ -0,0 +1,272 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy
zones
+ * is working correctly.
+ */
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceOperationComplexDistributedTest implements Serializable {
+ public static final int EXPECTED_BUCKET_COUNT = 113;
+ public static final long TIMEOUT_SECONDS =
GeodeAwaitility.getTimeout().getSeconds();
+ public static final String CLIENT_XML =
"RebalanceOperationComplex-client.xml";
+ public static final String SERVER_XML =
"RebalanceOperationComplex-server.xml";
+ public static final String REGION_NAME = "primary";
+ public static final String COLOCATED_REGION_NAME = "colocated";
+ public static final Logger logger = LogService.getLogger();
+
+ public static final String ZONE_A = "zoneA";
+ public static final String ZONE_B = "zoneB";
+ public int locatorPort;
+ public static final AtomicInteger runID = new AtomicInteger(0);
+ public String workingDir;
+
+ // 6 servers distributed evenly across 2 zones
+ public static final Map<Integer, String> SERVER_ZONE_MAP = new
HashMap<Integer, String>() {
+ {
+ put(1, ZONE_A);
+ put(2, ZONE_A);
+ put(3, ZONE_A);
+ put(4, ZONE_B);
+ put(5, ZONE_B);
+ put(6, ZONE_B);
+ }
+ };
+
+ @Rule
+ public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(8);
+
+ @Before
+ public void setup() {
+ // Start the locator
+ MemberVM locatorVM = clusterStartupRule.startLocatorVM(0);
+ locatorPort = locatorVM.getPort();
+
+ workingDir = clusterStartupRule.getWorkingDirRoot().getAbsolutePath();
+
+ runID.incrementAndGet();
+ cleanOutServerDirectories();
Review comment:
Why is this method necessary?
--
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]
