diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOpsCountStatistics.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOpsCountStatistics.java index b9852bad56..2113ae5c63 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOpsCountStatistics.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOpsCountStatistics.java @@ -41,12 +41,15 @@ public class DFSOpsCountStatistics extends StorageStatistics { /** This is for counting distributed file system operations. */ public enum OpType { + ADD_CACHE_DIRECTIVE("op_add_cache_directive"), + ADD_CACHE_POOL("op_add_cache_pool"), ADD_EC_POLICY("op_add_ec_policy"), ALLOW_SNAPSHOT("op_allow_snapshot"), APPEND(CommonStatisticNames.OP_APPEND), CONCAT("op_concat"), COPY_FROM_LOCAL_FILE(CommonStatisticNames.OP_COPY_FROM_LOCAL_FILE), CREATE(CommonStatisticNames.OP_CREATE), + CREATE_ENCRYPTION_ZONE("op_create_encryption_zone"), CREATE_NON_RECURSIVE(CommonStatisticNames.OP_CREATE_NON_RECURSIVE), CREATE_SNAPSHOT("op_create_snapshot"), CREATE_SYM_LINK("op_create_symlink"), @@ -61,6 +64,7 @@ public enum OpType { GET_EC_CODECS("op_get_ec_codecs"), GET_EC_POLICY("op_get_ec_policy"), GET_EC_POLICIES("op_get_ec_policies"), + GET_ENCRYPTION_ZONE("op_get_encryption_zone"), GET_FILE_BLOCK_LOCATIONS("op_get_file_block_locations"), GET_FILE_CHECKSUM(CommonStatisticNames.OP_GET_FILE_CHECKSUM), GET_FILE_LINK_STATUS("op_get_file_link_status"), @@ -72,8 +76,13 @@ public enum OpType { GET_STORAGE_POLICY("op_get_storage_policy"), GET_TRASH_ROOT("op_get_trash_root"), GET_XATTR("op_get_xattr"), + LIST_CACHE_DIRECTIVE("op_list_cache_directive"), + LIST_CACHE_POOL("op_list_cache_pool"), + LIST_ENCRYPTION_ZONE("op_list_encryption_zone"), LIST_LOCATED_STATUS(CommonStatisticNames.OP_LIST_LOCATED_STATUS), LIST_STATUS(CommonStatisticNames.OP_LIST_STATUS), + MODIFY_CACHE_POOL("op_modify_cache_pool"), + MODIFY_CACHE_DIRECTIVE("op_modify_cache_directive"), MKDIRS(CommonStatisticNames.OP_MKDIRS), MODIFY_ACL_ENTRIES(CommonStatisticNames.OP_MODIFY_ACL_ENTRIES), OPEN(CommonStatisticNames.OP_OPEN), @@ -81,16 +90,21 @@ public enum OpType { PRIMITIVE_MKDIR("op_primitive_mkdir"), REMOVE_ACL(CommonStatisticNames.OP_REMOVE_ACL), REMOVE_ACL_ENTRIES(CommonStatisticNames.OP_REMOVE_ACL_ENTRIES), + REMOVE_CACHE_DIRECTIVE("op_remove_cache_directive"), + REMOVE_CACHE_POOL("op_remove_cache_pool"), REMOVE_DEFAULT_ACL(CommonStatisticNames.OP_REMOVE_DEFAULT_ACL), REMOVE_EC_POLICY("op_remove_ec_policy"), REMOVE_XATTR("op_remove_xattr"), RENAME(CommonStatisticNames.OP_RENAME), RENAME_SNAPSHOT("op_rename_snapshot"), RESOLVE_LINK("op_resolve_link"), + SATISFY_STORAGE_POLICY("op_satisfy_storagepolicy"), SET_ACL(CommonStatisticNames.OP_SET_ACL), SET_EC_POLICY("op_set_ec_policy"), SET_OWNER(CommonStatisticNames.OP_SET_OWNER), SET_PERMISSION(CommonStatisticNames.OP_SET_PERMISSION), + SET_QUOTA_BYTSTORAGEYPE("op_set_quota_bystoragetype"), + SET_QUOTA_USAGE("op_set_quota_usage"), SET_REPLICATION("op_set_replication"), SET_STORAGE_POLICY("op_set_storagePolicy"), SET_TIMES(CommonStatisticNames.OP_SET_TIMES), diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java index 2b0b2c9f67..a1af465b24 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java @@ -1002,6 +1002,8 @@ public QuotaUsage next(final FileSystem fs, final Path p) */ public void setQuota(Path src, final long namespaceQuota, final long storagespaceQuota) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.SET_QUOTA_USAGE); Path absF = fixRelativePart(src); new FileSystemLinkResolver() { @Override @@ -1030,6 +1032,8 @@ public Void next(final FileSystem fs, final Path p) public void setQuotaByStorageType(Path src, final StorageType type, final long quota) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.SET_QUOTA_BYTSTORAGEYPE); Path absF = fixRelativePart(src); new FileSystemLinkResolver() { @Override @@ -2222,6 +2226,8 @@ public long addCacheDirective(CacheDirectiveInfo info) throws IOException { */ public long addCacheDirective( CacheDirectiveInfo info, EnumSet flags) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.ADD_CACHE_DIRECTIVE); Preconditions.checkNotNull(info.getPath()); Path path = new Path(getPathName(fixRelativePart(info.getPath()))). makeQualified(getUri(), getWorkingDirectory()); @@ -2249,6 +2255,8 @@ public void modifyCacheDirective(CacheDirectiveInfo info) throws IOException { */ public void modifyCacheDirective( CacheDirectiveInfo info, EnumSet flags) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.MODIFY_CACHE_DIRECTIVE); if (info.getPath() != null) { info = new CacheDirectiveInfo.Builder(info). setPath(new Path(getPathName(fixRelativePart(info.getPath()))). @@ -2265,6 +2273,8 @@ public void modifyCacheDirective( */ public void removeCacheDirective(long id) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.REMOVE_CACHE_DIRECTIVE); dfs.removeCacheDirective(id); } @@ -2277,6 +2287,8 @@ public void removeCacheDirective(long id) */ public RemoteIterator listCacheDirectives( CacheDirectiveInfo filter) throws IOException { + statistics.incrementReadOps(1); + storageStatistics.incrementOpCounter(OpType.LIST_CACHE_DIRECTIVE); if (filter == null) { filter = new CacheDirectiveInfo.Builder().build(); } @@ -2317,6 +2329,8 @@ public CacheDirectiveEntry next() throws IOException { * If the request could not be completed. */ public void addCachePool(CachePoolInfo info) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.ADD_CACHE_POOL); CachePoolInfo.validate(info); dfs.addCachePool(info); } @@ -2330,6 +2344,8 @@ public void addCachePool(CachePoolInfo info) throws IOException { * If the request could not be completed. */ public void modifyCachePool(CachePoolInfo info) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.MODIFY_CACHE_POOL); CachePoolInfo.validate(info); dfs.modifyCachePool(info); } @@ -2343,6 +2359,8 @@ public void modifyCachePool(CachePoolInfo info) throws IOException { * if the cache pool did not exist, or could not be removed. */ public void removeCachePool(String poolName) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.REMOVE_CACHE_POOL); CachePoolInfo.validateName(poolName); dfs.removeCachePool(poolName); } @@ -2356,6 +2374,8 @@ public void removeCachePool(String poolName) throws IOException { * If there was an error listing cache pools. */ public RemoteIterator listCachePools() throws IOException { + statistics.incrementReadOps(1); + storageStatistics.incrementOpCounter(OpType.LIST_CACHE_POOL); return dfs.listCachePools(); } @@ -2497,6 +2517,8 @@ public AclStatus next(final FileSystem fs, final Path p) /* HDFS only */ public void createEncryptionZone(final Path path, final String keyName) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.CREATE_ENCRYPTION_ZONE); Path absF = fixRelativePart(path); new FileSystemLinkResolver() { @Override @@ -2524,6 +2546,8 @@ public Void next(final FileSystem fs, final Path p) throws IOException { /* HDFS only */ public EncryptionZone getEZForPath(final Path path) throws IOException { + statistics.incrementReadOps(1); + storageStatistics.incrementOpCounter(OpType.GET_ENCRYPTION_ZONE); Preconditions.checkNotNull(path); Path absF = fixRelativePart(path); return new FileSystemLinkResolver() { @@ -2551,6 +2575,8 @@ public EncryptionZone next(final FileSystem fs, final Path p) /* HDFS only */ public RemoteIterator listEncryptionZones() throws IOException { + statistics.incrementReadOps(1); + storageStatistics.incrementOpCounter(OpType.LIST_ENCRYPTION_ZONE); return dfs.listEncryptionZones(); } @@ -2875,6 +2901,8 @@ public Void next(final FileSystem fs, final Path p) throws IOException { * @throws IOException */ public void satisfyStoragePolicy(final Path path) throws IOException { + statistics.incrementWriteOps(1); + storageStatistics.incrementOpCounter(OpType.SATISFY_STORAGE_POLICY); Path absF = fixRelativePart(path); new FileSystemLinkResolver() { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java index 97ced7a8c3..135cb4f358 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java @@ -37,6 +37,7 @@ import java.net.ServerSocket; import java.net.SocketTimeoutException; import java.net.URI; +import java.security.NoSuchAlgorithmException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collections; @@ -46,13 +47,17 @@ import java.util.List; import java.util.Random; import java.util.Set; +import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicReference; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.crypto.key.JavaKeyStoreProvider; +import org.apache.hadoop.crypto.key.KeyProvider; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.CreateFlag; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -78,10 +83,13 @@ import org.apache.hadoop.hdfs.client.impl.LeaseRenewer; import org.apache.hadoop.hdfs.DFSOpsCountStatistics.OpType; import org.apache.hadoop.hdfs.net.Peer; +import org.apache.hadoop.hdfs.protocol.CacheDirectiveInfo; +import org.apache.hadoop.hdfs.protocol.CachePoolInfo; import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; import org.apache.hadoop.hdfs.protocol.HdfsConstants; import org.apache.hadoop.hdfs.protocol.HdfsConstants.RollingUpgradeAction; import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction; +import org.apache.hadoop.hdfs.protocol.HdfsConstants.StoragePolicySatisfierMode; import org.apache.hadoop.hdfs.protocol.LocatedBlock; import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi; @@ -775,6 +783,119 @@ public void testStatistics() throws IOException { } } + @Test + public void testStatistics2() throws IOException, NoSuchAlgorithmException { + HdfsConfiguration conf = new HdfsConfiguration(); + conf.set(DFSConfigKeys.DFS_STORAGE_POLICY_SATISFIER_MODE_KEY, + StoragePolicySatisfierMode.EXTERNAL.toString()); + File tmpDir = GenericTestUtils.getTestDir(UUID.randomUUID().toString()); + final Path jksPath = new Path(tmpDir.toString(), "test.jks"); + conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH, + JavaKeyStoreProvider.SCHEME_NAME + "://file" + jksPath.toUri()); + + try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build()) { + cluster.waitActive(); + final DistributedFileSystem dfs = cluster.getFileSystem(); + Path dir = new Path("/testStat"); + dfs.mkdirs(dir); + int readOps = 0; + int writeOps = 0; + FileSystem.clearStatistics(); + + // Quota Commands. + long opCount = getOpStatistics(OpType.SET_QUOTA_USAGE); + dfs.setQuota(dir, 100, 1000); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.SET_QUOTA_USAGE, opCount + 1); + + opCount = getOpStatistics(OpType.SET_QUOTA_BYTSTORAGEYPE); + dfs.setQuotaByStorageType(dir, StorageType.DEFAULT, 2000); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.SET_QUOTA_BYTSTORAGEYPE, opCount + 1); + + opCount = getOpStatistics(OpType.GET_QUOTA_USAGE); + dfs.getQuotaUsage(dir); + checkStatistics(dfs, ++readOps, writeOps, 0); + checkOpStatistics(OpType.GET_QUOTA_USAGE, opCount + 1); + + // Satisfy Storage Policy. + opCount = getOpStatistics(OpType.SATISFY_STORAGE_POLICY); + dfs.satisfyStoragePolicy(dir); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.SATISFY_STORAGE_POLICY, opCount + 1); + + // Cache Commands. + CachePoolInfo cacheInfo = + new CachePoolInfo("pool1").setMode(new FsPermission((short) 0)); + + opCount = getOpStatistics(OpType.ADD_CACHE_POOL); + dfs.addCachePool(cacheInfo); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.ADD_CACHE_POOL, opCount + 1); + + CacheDirectiveInfo directive = new CacheDirectiveInfo.Builder() + .setPath(new Path(".")).setPool("pool1").build(); + + opCount = getOpStatistics(OpType.ADD_CACHE_DIRECTIVE); + long id = dfs.addCacheDirective(directive); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.ADD_CACHE_DIRECTIVE, opCount + 1); + + opCount = getOpStatistics(OpType.LIST_CACHE_DIRECTIVE); + dfs.listCacheDirectives(null); + checkStatistics(dfs, ++readOps, writeOps, 0); + checkOpStatistics(OpType.LIST_CACHE_DIRECTIVE, opCount + 1); + + opCount = getOpStatistics(OpType.MODIFY_CACHE_DIRECTIVE); + dfs.modifyCacheDirective(new CacheDirectiveInfo.Builder().setId(id) + .setReplication((short) 2).build()); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.MODIFY_CACHE_DIRECTIVE, opCount + 1); + + opCount = getOpStatistics(OpType.REMOVE_CACHE_DIRECTIVE); + dfs.removeCacheDirective(id); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.REMOVE_CACHE_DIRECTIVE, opCount + 1); + + opCount = getOpStatistics(OpType.MODIFY_CACHE_POOL); + dfs.modifyCachePool(cacheInfo); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.MODIFY_CACHE_POOL, opCount + 1); + + opCount = getOpStatistics(OpType.LIST_CACHE_POOL); + dfs.listCachePools(); + checkStatistics(dfs, ++readOps, writeOps, 0); + checkOpStatistics(OpType.LIST_CACHE_POOL, opCount + 1); + + opCount = getOpStatistics(OpType.REMOVE_CACHE_POOL); + dfs.removeCachePool(cacheInfo.getPoolName()); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.REMOVE_CACHE_POOL, opCount + 1); + + // Crypto Commands. + final KeyProvider provider = + cluster.getNameNode().getNamesystem().getProvider(); + final KeyProvider.Options options = KeyProvider.options(conf); + provider.createKey("key", options); + provider.flush(); + + opCount = getOpStatistics(OpType.CREATE_ENCRYPTION_ZONE); + dfs.createEncryptionZone(dir, "key"); + checkStatistics(dfs, readOps, ++writeOps, 0); + checkOpStatistics(OpType.CREATE_ENCRYPTION_ZONE, opCount + 1); + + opCount = getOpStatistics(OpType.LIST_ENCRYPTION_ZONE); + dfs.listEncryptionZones(); + checkStatistics(dfs, ++readOps, writeOps, 0); + checkOpStatistics(OpType.LIST_ENCRYPTION_ZONE, opCount + 1); + + opCount = getOpStatistics(OpType.GET_ENCRYPTION_ZONE); + dfs.getEZForPath(dir); + checkStatistics(dfs, ++readOps, writeOps, 0); + checkOpStatistics(OpType.GET_ENCRYPTION_ZONE, opCount + 1); + } + } + @Test public void testECStatistics() throws IOException { try (MiniDFSCluster cluster =