umamaheswararao commented on a change in pull request #2848: URL: https://github.com/apache/ozone/pull/2848#discussion_r756423854
########## File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestECBlockReconstructedInputStream.java ########## @@ -0,0 +1,317 @@ +/** + * 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.client.rpc.read; + +import org.apache.hadoop.hdds.client.BlockID; +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.ozone.client.io.ECBlockReconstructedInputStream; +import org.apache.hadoop.ozone.client.io.ECBlockReconstructedStripeInputStream; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SplittableRandom; +import java.util.concurrent.ThreadLocalRandom; + +import static org.apache.hadoop.ozone.client.rpc.read.ECStreamTestUtil.generateParity; + +/** + * Test for the ECBlockReconstructedInputStream class. + */ +public class TestECBlockReconstructedInputStream { + + private ECReplicationConfig repConfig; + private ECStreamTestUtil.TestBlockInputStreamFactory streamFactory; + private long randomSeed; + private ThreadLocalRandom random = ThreadLocalRandom.current(); + private SplittableRandom dataGenerator; + + @Before + public void setup() throws IOException { + repConfig = new ECReplicationConfig(3, 2); + streamFactory = new ECStreamTestUtil.TestBlockInputStreamFactory(); + + randomSeed = random.nextLong(); + dataGenerator = new SplittableRandom(randomSeed); + } + + private ECBlockReconstructedStripeInputStream createStripeInputStream( + Map<DatanodeDetails, Integer> dnMap, long blockLength) { + OmKeyLocationInfo keyInfo = + ECStreamTestUtil.createKeyInfo(repConfig, blockLength, dnMap); + streamFactory.setCurrentPipeline(keyInfo.getPipeline()); + return new ECBlockReconstructedStripeInputStream(repConfig, keyInfo, true, + null, null, streamFactory); + } + + @Test + public void testBlockLengthReturned() throws IOException { + Map<DatanodeDetails, Integer> dnMap = createIndexMap(4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, 12345L)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + Assert.assertEquals(12345L, stream.getLength()); + } + } + } + + @Test + public void testBlockIDReturned() throws IOException { + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, 12345L)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + Assert.assertEquals(new BlockID(1, 1), stream.getBlockID()); + } + } + } + + @Test + public void testReadDataByteBufferMultipleStripes() throws IOException { + int readBufferSize = random.nextInt(4096); + // 3 stripes and a partial chunk + int blockLength = repConfig.getEcChunkSize() * repConfig.getData() * 3 + + repConfig.getEcChunkSize() - 1; + ByteBuffer[] dataBufs = allocateBuffers(repConfig.getData(), + repConfig.getEcChunkSize() * 4); + ECStreamTestUtil.randomFill(dataBufs, repConfig.getEcChunkSize(), + dataGenerator, blockLength); + ByteBuffer[] parity = generateParity(dataBufs, repConfig); + addDataStreamsToFactory(dataBufs, parity); + + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 2, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, blockLength)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + ByteBuffer b = ByteBuffer.allocate(readBufferSize); + int totalRead = 0; + dataGenerator = new SplittableRandom(randomSeed); + while (totalRead < blockLength) { + int expectedRead = Math.min(blockLength - totalRead, readBufferSize); + long read = stream.read(b); + totalRead += read; + Assert.assertEquals(expectedRead, read); + ECStreamTestUtil.assertBufferMatches(b, dataGenerator); + b.clear(); + } + // Next read should be EOF + b.clear(); + long read = stream.read(b); + Assert.assertEquals(-1, read); + } + } + } + + @Test + public void testReadDataByteBufferUnderBufferSize() throws IOException { + int readBufferSize = 4096; + // Small block with less data that the read size + int blockLength = 1024; + + ByteBuffer[] dataBufs = allocateBuffers(repConfig.getData(), 1024); + ECStreamTestUtil.randomFill(dataBufs, repConfig.getEcChunkSize(), + dataGenerator, blockLength); + ByteBuffer[] parity = generateParity(dataBufs, repConfig); + addDataStreamsToFactory(dataBufs, parity); + + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 2, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, blockLength)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + ByteBuffer b = ByteBuffer.allocate(readBufferSize); + dataGenerator = new SplittableRandom(randomSeed); + long read = stream.read(b); + Assert.assertEquals(blockLength, read); + ECStreamTestUtil.assertBufferMatches(b, dataGenerator); + b.clear(); + // Next read should be EOF + read = stream.read(b); + Assert.assertEquals(-1, read); + } + } + } + + @Test + public void testReadByteAtATime() throws IOException { + // 3 stripes and a partial chunk + int blockLength = repConfig.getEcChunkSize() * repConfig.getData() * 3 + + repConfig.getEcChunkSize() - 1; + ByteBuffer[] dataBufs = allocateBuffers(repConfig.getData(), + repConfig.getEcChunkSize() * 4); + ECStreamTestUtil.randomFill(dataBufs, repConfig.getEcChunkSize(), + dataGenerator, blockLength); + ByteBuffer[] parity = generateParity(dataBufs, repConfig); + addDataStreamsToFactory(dataBufs, parity); + + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 2, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, blockLength)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + + dataGenerator = new SplittableRandom(randomSeed); + int totalRead = 0; + while (true) { + int val = stream.read(); + if (val == -1) { + break; + } + Assert.assertEquals(dataGenerator.nextInt(255), val); + totalRead += 1; + } + Assert.assertEquals(blockLength, totalRead); + } + } + } + + @Test + public void testReadByteBuffer() throws IOException { + // 3 stripes and a partial chunk + int blockLength = repConfig.getEcChunkSize() * repConfig.getData() * 3 + + repConfig.getEcChunkSize() - 1; + ByteBuffer[] dataBufs = allocateBuffers(repConfig.getData(), + repConfig.getEcChunkSize() * 4); + ECStreamTestUtil.randomFill(dataBufs, repConfig.getEcChunkSize(), + dataGenerator, blockLength); + ByteBuffer[] parity = generateParity(dataBufs, repConfig); + addDataStreamsToFactory(dataBufs, parity); + + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 2, 4, 5); + byte[] buf = new byte[1024]; + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, blockLength)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + int totalRead = 0; + dataGenerator = new SplittableRandom(randomSeed); + while (totalRead < blockLength) { + int expectedRead = Math.min(blockLength - totalRead, 1024); + long read = stream.read(buf, 0, buf.length); + totalRead += read; + Assert.assertEquals(expectedRead, read); + ECStreamTestUtil.assertBufferMatches( + ByteBuffer.wrap(buf, 0, (int)read), dataGenerator); + } + // Next read should be EOF + long read = stream.read(buf, 0, buf.length); + Assert.assertEquals(-1, read); + } + } + } + + @Test + public void testSeek() throws IOException { + int readBufferSize = repConfig.getEcChunkSize() + 1024; + // 3 stripes and a partial chunk + int blockLength = repConfig.getEcChunkSize() * repConfig.getData() * 3 + + repConfig.getEcChunkSize() - 1; + ByteBuffer[] dataBufs = allocateBuffers(repConfig.getData(), + repConfig.getEcChunkSize() * 4); + ECStreamTestUtil.randomFill(dataBufs, repConfig.getEcChunkSize(), + dataGenerator, blockLength); + ByteBuffer[] parity = generateParity(dataBufs, repConfig); + addDataStreamsToFactory(dataBufs, parity); + + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 2, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, blockLength)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + ByteBuffer b = ByteBuffer.allocate(readBufferSize); + + int seekPosition = 0; + for (int i = 0; i < 100; i++) { + resetAndAdvanceDataGenerator(seekPosition); + long expectedRead = Math.min(stream.getRemaining(), readBufferSize); + long read = stream.read(b); + Assert.assertEquals(expectedRead, read); + ECStreamTestUtil.assertBufferMatches(b, dataGenerator); + seekPosition = random.nextInt(blockLength); + stream.seek(seekPosition); + b.clear(); + } + // Seeking beyond EOF should give an error + try { + stream.seek(blockLength + 1); + Assert.fail("Seek beyond EOF should error"); + } catch (IOException e) { + // expected + } + } + } + } + + private void resetAndAdvanceDataGenerator(long position) { + dataGenerator = new SplittableRandom(randomSeed); + for (long i = 0; i < position; i++) { + dataGenerator.nextInt(255); + } + } + + /** + * Returns a new map containing a random DatanodeDetails for each index in + * inputs. + * @param idxs A list of indexes to add to the map + * @return A map of DatanodeDetails to index. + */ + private Map<DatanodeDetails, Integer> createIndexMap(int... idxs) { + Map<DatanodeDetails, Integer> map = new HashMap<>(); + for (int i : idxs) { + map.put(MockDatanodeDetails.randomDatanodeDetails(), i); + } + return map; + } + + /** + * Return a list of num ByteBuffers of the given size. + * @param num Number of buffers to create + * @param size The size of each buffer + * @return + */ Review comment: Thanks ########## File path: hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedInputStream.java ########## @@ -0,0 +1,205 @@ +/** + * 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.client.io; + +import org.apache.hadoop.hdds.client.BlockID; +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.scm.storage.BlockExtendedInputStream; +import org.apache.hadoop.hdds.scm.storage.ByteReaderStrategy; + +import java.io.EOFException; +import java.io.IOException; +import java.nio.ByteBuffer; + +/** + * Input stream which wraps a ECBlockReconstructedStripeInputStream to allow + * a EC Block to be read via the traditional InputStream read methods. + */ +public class ECBlockReconstructedInputStream extends BlockExtendedInputStream { + + private ECReplicationConfig repConfig; + private ECBlockReconstructedStripeInputStream stripeReader; + private ByteBuffer[] bufs; + private boolean closed = false; + + private long position = 0; + + public ECBlockReconstructedInputStream(ECReplicationConfig repConfig, + ECBlockReconstructedStripeInputStream stripeReader) { Review comment: ok make sense. ########## File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestECBlockReconstructedInputStream.java ########## @@ -0,0 +1,317 @@ +/** + * 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.client.rpc.read; + +import org.apache.hadoop.hdds.client.BlockID; +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.ozone.client.io.ECBlockReconstructedInputStream; +import org.apache.hadoop.ozone.client.io.ECBlockReconstructedStripeInputStream; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SplittableRandom; +import java.util.concurrent.ThreadLocalRandom; + +import static org.apache.hadoop.ozone.client.rpc.read.ECStreamTestUtil.generateParity; + +/** + * Test for the ECBlockReconstructedInputStream class. + */ +public class TestECBlockReconstructedInputStream { + + private ECReplicationConfig repConfig; + private ECStreamTestUtil.TestBlockInputStreamFactory streamFactory; + private long randomSeed; + private ThreadLocalRandom random = ThreadLocalRandom.current(); + private SplittableRandom dataGenerator; + + @Before + public void setup() throws IOException { + repConfig = new ECReplicationConfig(3, 2); + streamFactory = new ECStreamTestUtil.TestBlockInputStreamFactory(); + + randomSeed = random.nextLong(); + dataGenerator = new SplittableRandom(randomSeed); + } + + private ECBlockReconstructedStripeInputStream createStripeInputStream( + Map<DatanodeDetails, Integer> dnMap, long blockLength) { + OmKeyLocationInfo keyInfo = + ECStreamTestUtil.createKeyInfo(repConfig, blockLength, dnMap); + streamFactory.setCurrentPipeline(keyInfo.getPipeline()); + return new ECBlockReconstructedStripeInputStream(repConfig, keyInfo, true, + null, null, streamFactory); + } + + @Test + public void testBlockLengthReturned() throws IOException { + Map<DatanodeDetails, Integer> dnMap = createIndexMap(4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, 12345L)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + Assert.assertEquals(12345L, stream.getLength()); + } + } + } + + @Test + public void testBlockIDReturned() throws IOException { + Map<DatanodeDetails, Integer> dnMap = createIndexMap(1, 4, 5); + try(ECBlockReconstructedStripeInputStream stripeStream + = createStripeInputStream(dnMap, 12345L)) { + try (ECBlockReconstructedInputStream stream = + new ECBlockReconstructedInputStream(repConfig, stripeStream)) { + Assert.assertEquals(new BlockID(1, 1), stream.getBlockID()); + } + } + } + + @Test + public void testReadDataByteBufferMultipleStripes() throws IOException { + int readBufferSize = random.nextInt(4096); + // 3 stripes and a partial chunk Review comment: Got it. Thanks ########## File path: hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedInputStream.java ########## @@ -0,0 +1,205 @@ +/** + * 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.client.io; + +import org.apache.hadoop.hdds.client.BlockID; +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.scm.storage.BlockExtendedInputStream; +import org.apache.hadoop.hdds.scm.storage.ByteReaderStrategy; + +import java.io.EOFException; +import java.io.IOException; +import java.nio.ByteBuffer; + +/** + * Input stream which wraps a ECBlockReconstructedStripeInputStream to allow + * a EC Block to be read via the traditional InputStream read methods. + */ +public class ECBlockReconstructedInputStream extends BlockExtendedInputStream { + + private ECReplicationConfig repConfig; + private ECBlockReconstructedStripeInputStream stripeReader; + private ByteBuffer[] bufs; + private boolean closed = false; + + private long position = 0; + + public ECBlockReconstructedInputStream(ECReplicationConfig repConfig, + ECBlockReconstructedStripeInputStream stripeReader) { + this.repConfig = repConfig; + this.stripeReader = stripeReader; + + allocateBuffers(); + } + + @Override + public synchronized BlockID getBlockID() { + return stripeReader.getBlockID(); + } + + @Override + public synchronized long getRemaining() { + return getLength() - position; + } + + @Override + public synchronized long getLength() { + return stripeReader.getLength(); + } + + @Override + public synchronized int read(byte[] b, int off, int len) + throws IOException { + return read(ByteBuffer.wrap(b, off, len)); + } + + @Override + public synchronized int read(ByteBuffer buf) throws IOException { + ensureNotClosed(); + if (!hasRemaining()) { + return EOF; + } + int totalRead = 0; + while (buf.hasRemaining() && getRemaining() > 0) { + ByteBuffer b = selectNextBuffer(); + if (b == null) { + // This should not happen, so if it does abort. Review comment: Just hit format to below exception throwing statement. I think there should be some spaces between before and after '+' -- 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]
