Skip to content

HDDS-2214. TestSCMContainerPlacementRackAware has an intermittent fai… #6

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

Merged
xiaoyuyao merged 1 commit into from
Oct 22, 2019
Merged

HDDS-2214. TestSCMContainerPlacementRackAware has an intermittent fai… #6

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
67 changes: 36 additions & 31 deletions ...he/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
*/
package org.apache.hadoop.hdds.scm.container.placement.algorithms;

import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
Expand All @@ -30,25 +34,24 @@
import org.apache.hadoop.hdds.scm.net.NodeSchema;
import org.apache.hadoop.hdds.scm.net.NodeSchemaManager;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.mockito.Mockito;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import org.apache.commons.lang.StringUtils;
import static org.apache.hadoop.hdds.scm.net.NetConstants.LEAF_SCHEMA;
import static org.apache.hadoop.hdds.scm.net.NetConstants.RACK_SCHEMA;
import static org.apache.hadoop.hdds.scm.net.NetConstants.ROOT_SCHEMA;
import org.hamcrest.MatcherAssert;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import static org.mockito.Matchers.anyObject;
import org.mockito.Mockito;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -76,7 +79,7 @@ public TestSCMContainerPlacementRackAware(Integer count) {

@Parameterized.Parameters
public static Collection<Object[]> setupDatanodes() {
return Arrays.asList(new Object[][]{{3}, {4}, {5}, {6}, {7}, {8}, {9},
return Arrays.asList(new Object[][] {{3}, {4}, {5}, {6}, {7}, {8}, {9},
{10}, {11}, {12}, {13}, {14}, {15}});
}

Expand Down Expand Up @@ -131,7 +134,6 @@ public void setup() {
nodeManager, conf, cluster, false, metrics);
}


@Test
public void chooseNodeWithNoExcludedNodes() throws SCMException {
// test choose new datanodes for new pipeline cases
Expand Down Expand Up @@ -226,7 +228,7 @@ public void testFallback() throws SCMException {
assumeTrue(datanodeCount > NODE_PER_RACK * 2 &&
(datanodeCount % NODE_PER_RACK > 1));
int nodeNum = 5;
List<DatanodeDetails> datanodeDetails =
List<DatanodeDetails> datanodeDetails =
policy.chooseDatanodes(null, null, nodeNum, 15);
Assert.assertEquals(nodeNum, datanodeDetails.size());
Assert.assertTrue(cluster.isSameParent(datanodeDetails.get(0),
Expand All @@ -247,8 +249,8 @@ public void testFallback() throws SCMException {
long compromiseCount = metrics.getDatanodeChooseFallbackCount();

// verify metrics
Assert.assertTrue(totalRequest == nodeNum);
Assert.assertTrue(successCount == nodeNum);
Assert.assertEquals(totalRequest, nodeNum);
Assert.assertEquals(successCount, nodeNum);
Assert.assertTrue(tryCount > nodeNum);
Assert.assertTrue(compromiseCount >= 1);
}
Expand All @@ -263,7 +265,7 @@ public void testNoFallback() throws SCMException {
policyNoFallback.chooseDatanodes(null, null, nodeNum, 15);
fail("Fallback prohibited, this call should fail");
} catch (Exception e) {
assertTrue(e.getClass().getSimpleName().equals("SCMException"));
assertEquals("SCMException", e.getClass().getSimpleName());
}

// get metrics
Expand All @@ -272,10 +274,12 @@ public void testNoFallback() throws SCMException {
long tryCount = metrics.getDatanodeChooseAttemptCount();
long compromiseCount = metrics.getDatanodeChooseFallbackCount();

Assert.assertTrue(totalRequest == nodeNum);
Assert.assertTrue(successCount >= 3);
Assert.assertTrue(tryCount >= nodeNum);
Assert.assertTrue(compromiseCount == 0);
Assert.assertEquals(totalRequest, nodeNum);
MatcherAssert.assertThat("Not enough success count", successCount,
greaterThanOrEqualTo(1L));
MatcherAssert.assertThat("Not enough try count", tryCount,
greaterThanOrEqualTo((long) 1L));
Assert.assertEquals(compromiseCount, 0);
}

@Test
Expand All @@ -289,8 +293,8 @@ public void chooseNodeWithFavoredNodes() throws SCMException {
List<DatanodeDetails> datanodeDetails = policy.chooseDatanodes(
excludedNodes, favoredNodes, nodeNum, 15);
Assert.assertEquals(nodeNum, datanodeDetails.size());
Assert.assertTrue(datanodeDetails.get(0).getNetworkFullPath()
.equals(favoredNodes.get(0).getNetworkFullPath()));
Assert.assertEquals(datanodeDetails.get(0).getNetworkFullPath(),
favoredNodes.get(0).getNetworkFullPath());

// no overlap between excludedNodes and favoredNodes, favoredNodes can been
// chosen.
Expand All @@ -301,8 +305,8 @@ public void chooseNodeWithFavoredNodes() throws SCMException {
datanodeDetails = policy.chooseDatanodes(
excludedNodes, favoredNodes, nodeNum, 15);
Assert.assertEquals(nodeNum, datanodeDetails.size());
Assert.assertTrue(datanodeDetails.get(0).getNetworkFullPath()
.equals(favoredNodes.get(0).getNetworkFullPath()));
Assert.assertEquals(datanodeDetails.get(0).getNetworkFullPath(),
favoredNodes.get(0).getNetworkFullPath());

// there is overlap between excludedNodes and favoredNodes, favoredNodes
// should not be chosen.
Expand Down Expand Up @@ -335,10 +339,11 @@ public void testNoInfiniteLoop() throws SCMException {
long tryCount = metrics.getDatanodeChooseAttemptCount();
long compromiseCount = metrics.getDatanodeChooseFallbackCount();

Assert.assertTrue(totalRequest == nodeNum);
Assert.assertTrue(successCount == 0);
Assert.assertTrue(tryCount > nodeNum);
Assert.assertTrue(compromiseCount == 0);
Assert.assertEquals(totalRequest, nodeNum);
Assert.assertEquals(successCount, 0);
MatcherAssert.assertThat("Not enough try", tryCount,
greaterThanOrEqualTo((long) nodeNum));
Assert.assertEquals(compromiseCount, 0);
}

@Test
Expand Down Expand Up @@ -372,4 +377,4 @@ public void testDatanodeWithDefaultNetworkLocation() throws SCMException {
Assert.assertTrue(cluster.isSameParent(datanodeDetails.get(1),
datanodeDetails.get(2)));
}
}
}