You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by "mehakmeet (via GitHub)" <gi...@apache.org> on 2023/05/18 08:36:36 UTC
[GitHub] [hadoop] mehakmeet commented on a diff in pull request #5519: MAPREDUCE-7435. Manifest Committer OOM on abfs
mehakmeet commented on code in PR #5519:
URL: https://github.com/apache/hadoop/pull/5519#discussion_r1196389813
##########
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/impl/TestEntryFileIO.java:
##########
@@ -0,0 +1,381 @@
+/*
+ * 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.hadoop.mapreduce.lib.output.committer.manifest.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.assertj.core.api.Assertions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.mapreduce.lib.output.committer.manifest.AbstractManifestCommitterTest;
+import org.apache.hadoop.mapreduce.lib.output.committer.manifest.files.FileEntry;
+import org.apache.hadoop.util.functional.TaskPool;
+
+import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+import static org.apache.hadoop.util.functional.RemoteIterators.foreach;
+import static org.apache.hadoop.util.functional.RemoteIterators.rangeExcludingIterator;
+
+/**
+ * Test {@link EntryFileIO}.
+ */
+public class TestEntryFileIO extends AbstractManifestCommitterTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(
+ TestEntryFileIO.class);
+
+ /**
+ * Entry to save.
+ */
+ public static final FileEntry ENTRY = new FileEntry("source", "dest", 100, "etag");
+
+ /**
+ * Entry file instance.
+ */
+ private EntryFileIO entryFileIO;
+
+ /**
+ * Path to a test entry file.
+ */
+ private File entryFile;
+
+ /**
+ * Create an entry file during setup.
+ */
+ @Before
+ public void setup() throws Exception {
+ entryFileIO = new EntryFileIO(new Configuration());
+ createEntryFile();
+ }
+
+ /**
+ * Teardown deletes any entry file.
+ * @throws Exception on any failure
+ */
+ @After
+ public void teardown() throws Exception {
+ Thread.currentThread().setName("teardown");
+ if (getEntryFile() != null) {
+ getEntryFile().delete();
+ }
+ }
+
+ /**
+ * Create a temp entry file and set the entryFile field to it.
+ * @throws IOException creation failure
+ */
+ private void createEntryFile() throws IOException {
+ setEntryFile(File.createTempFile("entry", ".seq"));
+ }
+
+ /**
+ * reference to any temp file created.
+ */
+ private File getEntryFile() {
+ return entryFile;
+ }
+
+ private void setEntryFile(File entryFile) {
+ this.entryFile = entryFile;
+ }
+
+ /**
+ * Create a file with one entry, then read it back
+ * via all the mechanisms available.
+ */
+ @Test
+ public void testCreateWriteReadFileOneEntry() throws Throwable {
+
+ final FileEntry source = ENTRY;
+
+ // do an explicit close to help isolate any failure.
+ SequenceFile.Writer writer = createWriter();
+ writer.append(NullWritable.get(), source);
+ writer.flush();
Review Comment:
just a doubt here. Do we need to explicitly flush the writer before closing? Won't that be done in close too? If yes, we can test both mechanisms by just saying writer.close()
##########
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/impl/TestEntryFileIO.java:
##########
@@ -0,0 +1,381 @@
+/*
+ * 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.hadoop.mapreduce.lib.output.committer.manifest.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.assertj.core.api.Assertions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RemoteIterator;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.mapreduce.lib.output.committer.manifest.AbstractManifestCommitterTest;
+import org.apache.hadoop.mapreduce.lib.output.committer.manifest.files.FileEntry;
+import org.apache.hadoop.util.functional.TaskPool;
+
+import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+import static org.apache.hadoop.util.functional.RemoteIterators.foreach;
+import static org.apache.hadoop.util.functional.RemoteIterators.rangeExcludingIterator;
+
+/**
+ * Test {@link EntryFileIO}.
+ */
+public class TestEntryFileIO extends AbstractManifestCommitterTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(
+ TestEntryFileIO.class);
+
+ /**
+ * Entry to save.
+ */
+ public static final FileEntry ENTRY = new FileEntry("source", "dest", 100, "etag");
+
+ /**
+ * Entry file instance.
+ */
+ private EntryFileIO entryFileIO;
+
+ /**
+ * Path to a test entry file.
+ */
+ private File entryFile;
+
+ /**
+ * Create an entry file during setup.
+ */
+ @Before
+ public void setup() throws Exception {
+ entryFileIO = new EntryFileIO(new Configuration());
+ createEntryFile();
+ }
+
+ /**
+ * Teardown deletes any entry file.
+ * @throws Exception on any failure
+ */
+ @After
+ public void teardown() throws Exception {
+ Thread.currentThread().setName("teardown");
+ if (getEntryFile() != null) {
+ getEntryFile().delete();
+ }
+ }
+
+ /**
+ * Create a temp entry file and set the entryFile field to it.
+ * @throws IOException creation failure
+ */
+ private void createEntryFile() throws IOException {
+ setEntryFile(File.createTempFile("entry", ".seq"));
+ }
+
+ /**
+ * reference to any temp file created.
+ */
+ private File getEntryFile() {
+ return entryFile;
+ }
+
+ private void setEntryFile(File entryFile) {
+ this.entryFile = entryFile;
+ }
+
+ /**
+ * Create a file with one entry, then read it back
+ * via all the mechanisms available.
+ */
+ @Test
+ public void testCreateWriteReadFileOneEntry() throws Throwable {
+
+ final FileEntry source = ENTRY;
+
+ // do an explicit close to help isolate any failure.
+ SequenceFile.Writer writer = createWriter();
+ writer.append(NullWritable.get(), source);
+ writer.flush();
+ writer.close();
+
+ FileEntry readBack = new FileEntry();
+ try (SequenceFile.Reader reader = readEntryFile()) {
+ reader.next(NullWritable.get(), readBack);
+ }
+ Assertions.assertThat(readBack)
+ .describedAs("entry read back from sequence file")
+ .isEqualTo(source);
+
+ // now use the iterator to access it.
+ final RemoteIterator<FileEntry> it =
+ iterateOverEntryFile();
+ List<FileEntry> files = new ArrayList<>();
+ foreach(it, files::add);
+ Assertions.assertThat(files)
+ .describedAs("iteration over the entry file")
+ .hasSize(1)
+ .element(0)
+ .isEqualTo(source);
+ final EntryFileIO.EntryIterator et = (EntryFileIO.EntryIterator) it;
+ Assertions.assertThat(et)
+ .describedAs("entry iterator %s", et)
+ .matches(p -> p.isClosed())
+ .extracting(p -> p.getCount())
+ .isEqualTo(1);
+ }
+
+ /**
+ * Create a writer.
+ * @return a writer
+ * @throws IOException failure to create the file.
+ */
+ private SequenceFile.Writer createWriter() throws IOException {
+ return entryFileIO.createWriter(getEntryFile());
+ }
+
+ /**
+ * Create an iterator over the records in the (non empty) entry file.
+ * @return an iterator over entries.
+ * @throws IOException failure to open the file
+ */
+ private RemoteIterator<FileEntry> iterateOverEntryFile() throws IOException {
+ return entryFileIO.iterateOver(readEntryFile());
+ }
+
+ /**
+ * Create a reader for the (non empty) entry file.
+ * @return a reader.
+ * @throws IOException failure to open the file
+ */
+ private SequenceFile.Reader readEntryFile() throws IOException {
+ assertEntryFileNonEmpty();
+
+ return entryFileIO.createReader(getEntryFile());
+ }
+
+ /**
+ * Create a file with one entry.
+ */
+ @Test
+ public void testCreateEmptyFile() throws Throwable {
+
+ final File file = getEntryFile();
+
+ entryFileIO.createWriter(file).close();
+
+ // now use the iterator to access it.
+ List<FileEntry> files = new ArrayList<>();
+ Assertions.assertThat(foreach(iterateOverEntryFile(), files::add))
+ .isEqualTo(0);
Review Comment:
Can you clarify which value equates to "0" in this test by some comments?
##########
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/statistics/TestIOStatisticsSetters.java:
##########
@@ -0,0 +1,172 @@
+/*
+ * 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.hadoop.fs.statistics;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.apache.hadoop.fs.statistics.impl.ForwardingIOStatisticsStore;
+import org.apache.hadoop.fs.statistics.impl.IOStatisticsStore;
+import org.apache.hadoop.test.AbstractHadoopTestBase;
+
+import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticCounter;
+import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticGauge;
+import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticMaximum;
+import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticMean;
+import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticMinimum;
+import static org.apache.hadoop.fs.statistics.impl.IOStatisticsBinding.iostatisticsStore;
+
+/**
+ * Test the {@link IOStatisticsSetters} interface implementations through
+ * a parameterized run with each implementation.
+ * For each of the setters, the value is set, verified,
+ * updated, verified again.
+ * An option known to be undefined in all created IOStatisticsStore instances
+ * is set, to verify it is harmless.
+ */
+
+@RunWith(Parameterized.class)
+
+public class TestIOStatisticsSetters extends AbstractHadoopTestBase {
+
+ public static final String COUNTER = "counter";
+
+ public static final String GAUGE = "gauge";
+
+ public static final String MAXIMUM = "max";
+
+ public static final String MINIMUM = "min";
+
+ public static final String MEAN = "mean";
+
+ private final IOStatisticsSetters ioStatistics;
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> params() {
+ return Arrays.asList(new Object[][]{
+ {new IOStatisticsSnapshot()},
+ {createTestStore()},
+ {new ForwardingIOStatisticsStore(createTestStore())},
+ });
+ }
+
+ /**
+ * Create a test store with the stats used for testing set up.
+ * @return a set up store
+ */
+ private static IOStatisticsStore createTestStore() {
+ return iostatisticsStore()
+ .withCounters(COUNTER)
+ .withGauges(GAUGE)
+ .withMaximums(MAXIMUM)
+ .withMinimums(MINIMUM)
+ .withMeanStatistics(MEAN)
+ .build();
+ }
+
+ public TestIOStatisticsSetters(IOStatisticsSetters ioStatisticsSetters) {
+ this.ioStatistics = ioStatisticsSetters;
+ }
+
+ @Test
+ public void testCounter() throws Throwable {
+ // write
+ ioStatistics.setCounter(COUNTER, 1);
+ assertThatStatisticCounter(ioStatistics, COUNTER)
+ .isEqualTo(1);
+
+ // update
+ ioStatistics.setCounter(COUNTER, 2);
+ assertThatStatisticCounter(ioStatistics, COUNTER)
+ .isEqualTo(2);
+
+ // unknown value
+ ioStatistics.setCounter("c2", 3);
Review Comment:
how about e assert that this unknown counter shouldn't exist in the counters map? Just to test the no-op I guess.
##########
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/TestRenameStageFailure.java:
##########
@@ -82,6 +85,8 @@ public class TestRenameStageFailure extends AbstractManifestCommitterTest {
/** resilient commit expected? */
private boolean resilientCommit;
+ private EntryFileIO entryFileIO;
Review Comment:
javadocs for consistency.
##########
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/TestJobThroughManifestCommitter.java:
##########
@@ -141,6 +145,9 @@
*/
private StageConfig ta11Config;
+ private LoadedManifestData
Review Comment:
javadocs for consistency.
--
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: common-issues-unsubscribe@hadoop.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-issues-help@hadoop.apache.org