TEZ-3331: Add operation specific HDFS counters for Tez UI #379
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /** | ||
| * 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.tez.runtime.metrics; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.hdfs.DFSTestUtil; | ||
| import org.apache.hadoop.hdfs.MiniDFSCluster; | ||
| import org.apache.tez.common.counters.FileSystemCounter; | ||
| import org.apache.tez.common.counters.TezCounter; | ||
| import org.apache.tez.common.counters.TezCounters; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class TestFileSystemStatisticUpdater { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger( | ||
| TestFileSystemStatisticUpdater.class); | ||
|
|
||
| private static MiniDFSCluster dfsCluster; | ||
|
|
||
| private static final Configuration CONF = new Configuration(); | ||
| private static FileSystem remoteFs; | ||
|
|
||
| private static final String TEST_ROOT_DIR = "target" + Path.SEPARATOR + | ||
| TestFileSystemStatisticUpdater.class.getName() + "-tmpDir"; | ||
|
|
||
| @BeforeClass | ||
| public static void beforeClass() throws Exception { | ||
| CONF.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, TEST_ROOT_DIR); | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void tearDown() { | ||
| if (dfsCluster != null) { | ||
| dfsCluster.shutdown(); | ||
| dfsCluster = null; | ||
| } | ||
| } | ||
|
|
||
| @Before | ||
| public void setup() throws IOException { | ||
| FileSystem.clearStatistics(); | ||
| try { | ||
| // tear down the whole cluster before each test to completely get rid of file system statistics | ||
| if (dfsCluster != null) { | ||
| dfsCluster.shutdown(); | ||
| } | ||
| dfsCluster = new MiniDFSCluster.Builder(CONF).numDataNodes(2).build(); | ||
| remoteFs = dfsCluster.getFileSystem(); | ||
| } catch (IOException io) { | ||
| throw new RuntimeException("problem starting mini dfs cluster", io); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void basicTest() throws IOException { | ||
| TezCounters counters = new TezCounters(); | ||
| TaskCounterUpdater updater = new TaskCounterUpdater(counters, CONF, "pid"); | ||
|
|
||
| DFSTestUtil.writeFile(remoteFs, new Path("/tmp/foo/abc.txt"), "xyz"); | ||
|
|
||
| updater.updateCounters(); | ||
|
There was a problem hiding this comment. shouldn't we first do In case there is any test added in future which does FS operations, I believe this test will screw up. So better to reset everything to 0, before we start testing There was a problem hiding this comment. taking care of that in a @before method |
||
| LOG.info("Counters (after first update): {}", counters); | ||
| assertCounter(counters, FileSystemCounter.OP_MKDIRS, 0); // DFSTestUtil doesn't call separate mkdirs | ||
| assertCounter(counters, FileSystemCounter.OP_CREATE, 1); | ||
| assertCounter(counters, FileSystemCounter.BYTES_WRITTEN, 3); // "xyz" | ||
| assertCounter(counters, FileSystemCounter.WRITE_OPS, 1); | ||
| assertCounter(counters, FileSystemCounter.OP_GET_FILE_STATUS, 1); // DFSTestUtil calls fs.exists | ||
| assertCounter(counters, FileSystemCounter.OP_CREATE, 1); | ||
|
|
||
| DFSTestUtil.writeFile(remoteFs, new Path("/tmp/foo/abc1.txt"), "xyz"); | ||
|
|
||
| updater.updateCounters(); | ||
| LOG.info("Counters (after second update): {}", counters); | ||
| assertCounter(counters, FileSystemCounter.OP_CREATE, 2); | ||
| assertCounter(counters, FileSystemCounter.BYTES_WRITTEN, 6); // "xyz" has been written twice | ||
| assertCounter(counters, FileSystemCounter.WRITE_OPS, 2); | ||
| assertCounter(counters, FileSystemCounter.OP_GET_FILE_STATUS, 2); // DFSTestUtil calls fs.exists again | ||
| assertCounter(counters, FileSystemCounter.OP_CREATE, 2); | ||
|
|
||
| // Ensure all numbers are reset | ||
| updater.updateCounters(); | ||
| LOG.info("Counters (after third update): {}", counters); | ||
| // counter holds its value after clearStatistics + updateCounters | ||
| assertCounter(counters, FileSystemCounter.OP_CREATE, 2); | ||
| } | ||
|
|
||
| private void assertCounter(TezCounters counters, FileSystemCounter fsCounter, int value) { | ||
| TezCounter counter = counters.findCounter(remoteFs.getScheme(), fsCounter); | ||
| Assert.assertNotNull(counter); | ||
| Assert.assertEquals(value, counter.getValue()); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There seems to be some more counters as well, like
OP_CREATE_NON_RECURSIVE,OP_EXISTS,OP_IS_FILEetcShould we include them as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I'm refreshing it according to the current state of CommonStatisticNames