adoroszlai commented on code in PR #5543: URL: https://github.com/apache/ozone/pull/5543#discussion_r1386146573
########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java: ########## @@ -0,0 +1,162 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.container.replication; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Semaphore; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; +import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; +import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; +import org.apache.hadoop.ozone.container.common.impl.ContainerData; +import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml; +import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion; +import org.apache.hadoop.ozone.container.common.impl.ContainerSet; +import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet; +import org.apache.hadoop.ozone.container.common.volume.StorageVolume; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.ozone.test.GenericTestUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.rules.TemporaryFolder; + +import static org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Test for {@link ContainerImporter}. + */ +class TestContainerImporter { + + private OzoneConfiguration conf; + + @BeforeEach + void setup() { + conf = new OzoneConfiguration(); + } + + @Test + void importSameContainerWhenAlreadyImport() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + ContainerController controllerMock = mock(ContainerController.class); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + containerSet.addContainer(container); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + File tarFile = new File("dummy.tar"); + // second import should fail immediately + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + assertFalse(true, "exception should occur"); + } catch (StorageContainerException ex) { + assertTrue(ex.getResult().equals( + ContainerProtos.Result.CONTAINER_EXISTS)); + } + } + + @Test + void importSameContainerWhenFirstInProgress() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + // mock controller for return container data with delay + ContainerController controllerMock = mock(ContainerController.class); + Semaphore semaphore = new Semaphore(1); Review Comment: The test is passing, but not due to being import being in-progress, rather due to container already exists. We need to make the separate thread block before completing the first import. This is one of the changes needed for that: ```suggestion Semaphore semaphore = new Semaphore(0); ``` ########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java: ########## @@ -0,0 +1,162 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.container.replication; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Semaphore; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; +import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; +import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; +import org.apache.hadoop.ozone.container.common.impl.ContainerData; +import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml; +import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion; +import org.apache.hadoop.ozone.container.common.impl.ContainerSet; +import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet; +import org.apache.hadoop.ozone.container.common.volume.StorageVolume; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.ozone.test.GenericTestUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.rules.TemporaryFolder; + +import static org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Test for {@link ContainerImporter}. + */ +class TestContainerImporter { + + private OzoneConfiguration conf; + + @BeforeEach + void setup() { + conf = new OzoneConfiguration(); + } + + @Test + void importSameContainerWhenAlreadyImport() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + ContainerController controllerMock = mock(ContainerController.class); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + containerSet.addContainer(container); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + File tarFile = new File("dummy.tar"); + // second import should fail immediately + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + assertFalse(true, "exception should occur"); + } catch (StorageContainerException ex) { + assertTrue(ex.getResult().equals( + ContainerProtos.Result.CONTAINER_EXISTS)); + } + } + + @Test + void importSameContainerWhenFirstInProgress() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + // mock controller for return container data with delay + ContainerController controllerMock = mock(ContainerController.class); + Semaphore semaphore = new Semaphore(1); + when(controllerMock.importContainer(any(), any(), any())) + .thenAnswer((invocation) -> { + semaphore.acquire(); + return container; + }); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + // run import async first time having delay + File tarFile = containerTarFile(containerId, containerData); + CompletableFuture.runAsync(() -> { + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + } catch (Exception ex) { + // do nothing + } + }); + GenericTestUtils.waitFor(() -> semaphore.availablePermits() == 0, Review Comment: The other one: ```suggestion GenericTestUtils.waitFor(semaphore::hasQueuedThreads, ``` ########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java: ########## @@ -0,0 +1,162 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.container.replication; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Semaphore; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; +import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; +import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; +import org.apache.hadoop.ozone.container.common.impl.ContainerData; +import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml; +import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion; +import org.apache.hadoop.ozone.container.common.impl.ContainerSet; +import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet; +import org.apache.hadoop.ozone.container.common.volume.StorageVolume; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.ozone.test.GenericTestUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.rules.TemporaryFolder; + +import static org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Test for {@link ContainerImporter}. + */ +class TestContainerImporter { + + private OzoneConfiguration conf; + + @BeforeEach + void setup() { + conf = new OzoneConfiguration(); + } + + @Test + void importSameContainerWhenAlreadyImport() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + ContainerController controllerMock = mock(ContainerController.class); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + containerSet.addContainer(container); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + File tarFile = new File("dummy.tar"); + // second import should fail immediately + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + assertFalse(true, "exception should occur"); + } catch (StorageContainerException ex) { + assertTrue(ex.getResult().equals( + ContainerProtos.Result.CONTAINER_EXISTS)); + } + } + + @Test + void importSameContainerWhenFirstInProgress() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + // mock controller for return container data with delay + ContainerController controllerMock = mock(ContainerController.class); + Semaphore semaphore = new Semaphore(1); + when(controllerMock.importContainer(any(), any(), any())) + .thenAnswer((invocation) -> { + semaphore.acquire(); + return container; + }); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + // run import async first time having delay + File tarFile = containerTarFile(containerId, containerData); + CompletableFuture.runAsync(() -> { + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + } catch (Exception ex) { + // do nothing + } + }); + GenericTestUtils.waitFor(() -> semaphore.availablePermits() == 0, + 10, 5000); + // run import second time and should fail immediately as + // first import in progress + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + assertFalse(true, "exception should occur"); + } catch (StorageContainerException ex) { Review Comment: To ensure test case is verifying the intended scenario. ```suggestion } catch (StorageContainerException ex) { assertTrue(ex.getMessage().contains("import in progress"), ex.getMessage()); ``` ########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java: ########## @@ -0,0 +1,162 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.container.replication; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Semaphore; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; +import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; +import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; +import org.apache.hadoop.ozone.container.common.impl.ContainerData; +import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml; +import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion; +import org.apache.hadoop.ozone.container.common.impl.ContainerSet; +import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet; +import org.apache.hadoop.ozone.container.common.volume.StorageVolume; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer; +import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.ozone.test.GenericTestUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.rules.TemporaryFolder; + +import static org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Test for {@link ContainerImporter}. + */ +class TestContainerImporter { + + private OzoneConfiguration conf; + + @BeforeEach + void setup() { + conf = new OzoneConfiguration(); + } + + @Test + void importSameContainerWhenAlreadyImport() throws Exception { + long containerId = 1; + // create container + KeyValueContainerData containerData = new KeyValueContainerData(containerId, + ContainerLayoutVersion.FILE_PER_BLOCK, 100, "test", "test"); + KeyValueContainer container = new KeyValueContainer(containerData, conf); + ContainerController controllerMock = mock(ContainerController.class); + // create containerImporter object + ContainerSet containerSet = new ContainerSet(0); + containerSet.addContainer(container); + MutableVolumeSet volumeSet = new MutableVolumeSet("test", conf, null, + StorageVolume.VolumeType.DATA_VOLUME, null); + ContainerImporter containerImporter = new ContainerImporter(conf, + containerSet, controllerMock, volumeSet); + File tarFile = new File("dummy.tar"); + // second import should fail immediately + try { + containerImporter.importContainer(containerId, tarFile.toPath(), + null, NO_COMPRESSION); + assertFalse(true, "exception should occur"); + } catch (StorageContainerException ex) { + assertTrue(ex.getResult().equals( + ContainerProtos.Result.CONTAINER_EXISTS)); + } Review Comment: Nit: can be simplified. ```suggestion StorageContainerException ex = assertThrows(StorageContainerException.class, () -> containerImporter.importContainer(containerId, tarFile.toPath(), null, NO_COMPRESSION)); assertEquals(ContainerProtos.Result.CONTAINER_EXISTS, ex.getResult()); ``` Applies to the other test method, too. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
