Skip to content

HDDS-3970. Enabling TestStorageContainerManager with all failures add… #1257

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
adoroszlai merged 4 commits into from
Jul 30, 2020
Merged

HDDS-3970. Enabling TestStorageContainerManager with all failures add… #1257

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1e7598
HDDS-3970. Enabling TestStorageContainerManager with all failures add…
prashantpogde Jul 25, 2020
141c89e
HDDS-3970. Changes after addressing code review comments.
prashantpogde Jul 28, 2020
938db9c
HDDS-3970. Part3 : Changes after addressing code review comments.
prashantpogde Jul 28, 2020
6f3dea0
trigger new CI check
adoroszlai Jul 29, 2020
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
33 changes: 25 additions & 8 deletions ...e/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static org.apache.hadoop.hdds.HddsConfigKeys
.HDDS_SCM_SAFEMODE_PIPELINE_CREATION;
import static org.junit.Assert.fail;
import org.junit.Ignore;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -109,7 +108,6 @@
/**
* Test class that exercises the StorageContainerManager.
*/
@Ignore
public class TestStorageContainerManager {
private static XceiverClientManager xceiverClientManager;
private static final Logger LOG = LoggerFactory.getLogger(
Expand All @@ -119,7 +117,7 @@ public class TestStorageContainerManager {
* Set the timeout for every test.
*/
@Rule
public Timeout testTimeout = new Timeout(300000);
public Timeout testTimeout = new Timeout(900000);

@Rule
public ExpectedException thrown = ExpectedException.none();
Expand Down Expand Up @@ -525,7 +523,7 @@ public void testScmInfo() throws Exception {
/**
* Test datanode heartbeat well processed with a 4-layer network topology.
*/
@Test(timeout = 60000)
@Test(timeout = 180000)
public void testScmProcessDatanodeHeartbeat() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
String scmId = UUID.randomUUID().toString();
Expand Down Expand Up @@ -593,7 +591,10 @@ public void testCloseContainerCommandOnRestart() throws Exception {
new TestStorageContainerManagerHelper(cluster, conf);

helper.createKeys(10, 4096);
Thread.sleep(5000);
GenericTestUtils.waitFor(() -> {
return cluster.getStorageContainerManager().getContainerManager().
getContainers() != null;
}, 1000, 10000);

StorageContainerManager scm = cluster.getStorageContainerManager();
List<ContainerInfo> containers = cluster.getStorageContainerManager()
Expand All @@ -604,8 +605,18 @@ public void testCloseContainerCommandOnRestart() throws Exception {
// Stop processing HB
scm.getDatanodeProtocolServer().stop();

scm.getContainerManager().updateContainerState(selectedContainer
.containerID(), HddsProtos.LifeCycleEvent.FINALIZE);
LOG.info(
"Current Container State is {}", selectedContainer.getState());
try {
scm.getContainerManager().updateContainerState(selectedContainer
.containerID(), HddsProtos.LifeCycleEvent.FINALIZE);
} catch (SCMException ex) {
if (selectedContainer.getState() != HddsProtos.LifeCycleState.CLOSING) {
ex.printStackTrace();
throw(ex);
}
}

cluster.restartStorageContainerManager(false);
scm = cluster.getStorageContainerManager();
EventPublisher publisher = mock(EventPublisher.class);
Expand All @@ -616,7 +627,6 @@ public void testCloseContainerCommandOnRestart() throws Exception {
modifiersField.setAccessible(true);
modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
f.set(replicationManager, publisher);
Thread.sleep(10000);

UUID dnUuid = cluster.getHddsDatanodes().iterator().next()
.getDatanodeDetails().getUuid();
Expand All @@ -628,6 +638,13 @@ public void testCloseContainerCommandOnRestart() throws Exception {
CommandForDatanode commandForDatanode = new CommandForDatanode(
dnUuid, closeContainerCommand);

GenericTestUtils.waitFor(() -> {
return replicationManager.isRunning();
}, 1000, 25000);

// Give ReplicationManager some time to process the containers.
Thread.sleep(5000);

verify(publisher).fireEvent(eq(SCMEvents.DATANODE_COMMAND), argThat(new
CloseContainerCommandMatcher(dnUuid, commandForDatanode)));
} finally {
Expand Down