Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FDCF17D50 for ; Wed, 11 Feb 2015 18:43:20 +0000 (UTC) Received: (qmail 87691 invoked by uid 500); 11 Feb 2015 18:43:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 87614 invoked by uid 500); 11 Feb 2015 18:43:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 87603 invoked by uid 99); 11 Feb 2015 18:43:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 18:43:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 18692E028F; Wed, 11 Feb 2015 18:43:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Wed, 11 Feb 2015 18:43:20 -0000 Message-Id: <604821d1e4fb45778fbe051464b65a55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] hadoop git commit: HDFS-7723. Quota By Storage Type namenode implemenation. (Contributed by Xiaoyu Yao) Repository: hadoop Updated Branches: refs/heads/trunk e42fc1a25 -> 5dae97a58 http://git-wip-us.apache.org/repos/asf/hadoop/blob/5dae97a5/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml index 2a1b549..201db9e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml @@ -1,6 +1,6 @@ - -62 + -63 OP_START_LOG_SEGMENT @@ -13,8 +13,8 @@ 2 1 - 1422569009939 - 907cb34000041937 + 1423097579620 + ef3f2032e2797e8e @@ -24,8 +24,8 @@ 3 2 - 1422569009941 - 178fa1bd83474b43 + 1423097579622 + b978ed731a0b4a65 @@ -37,18 +37,18 @@ 16386 /file_create 1 - 1421877810832 - 1421877810832 + 1422406380345 + 1422406380345 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 6 @@ -60,14 +60,14 @@ 0 /file_create 1 - 1421877810888 - 1421877810832 + 1422406380369 + 1422406380345 512 false - jing + xyao supergroup 420 @@ -78,10 +78,10 @@ 6 /file_create - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 false - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 8 @@ -93,14 +93,14 @@ 0 /file_create 1 - 1421877810899 - 1421877810832 + 1422406380376 + 1422406380345 512 false - jing + xyao supergroup 420 @@ -121,8 +121,8 @@ 0 /file_create /file_moved - 1421877810907 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 1422406380383 + 7334ec24-dd6b-4efd-807d-ed0d18625534 11 @@ -132,8 +132,8 @@ 10 0 /file_moved - 1421877810915 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 1422406380392 + 7334ec24-dd6b-4efd-807d-ed0d18625534 12 @@ -144,9 +144,9 @@ 0 16387 /directory_mkdir - 1421877810923 + 1422406380399 - jing + xyao supergroup 493 @@ -179,7 +179,7 @@ 15 /directory_mkdir snapshot1 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 17 @@ -190,7 +190,7 @@ /directory_mkdir snapshot1 snapshot2 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 18 @@ -200,7 +200,7 @@ 17 /directory_mkdir snapshot2 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 19 @@ -212,18 +212,18 @@ 16388 /file_create 1 - 1421877810946 - 1421877810946 + 1422406380423 + 1422406380423 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd + 7334ec24-dd6b-4efd-807d-ed0d18625534 20 @@ -235,14 +235,14 @@ 0 /file_create 1 - 1421877810948 - 1421877810946 + 1422406380425 + 1422406380423 512 false - jing + xyao supergroup 420 @@ -292,59 +292,68 @@ - OP_RENAME + OP_SET_QUOTA_BY_STORAGETYPE 25 + /directory_mkdir + 1 + 888 + + + + OP_RENAME + + 26 0 /file_create /file_moved - 1421877810968 + 1422406380442 NONE - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 27 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 28 OP_ADD - 26 + 27 0 16389 /file_concat_target 1 - 1421877810972 - 1421877810972 + 1422406380446 + 1422406380446 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 29 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 30 OP_ALLOCATE_BLOCK_ID - 27 + 28 1073741825 OP_SET_GENSTAMP_V2 - 28 + 29 1001 OP_ADD_BLOCK - 29 + 30 /file_concat_target 1073741825 @@ -358,21 +367,21 @@ OP_ALLOCATE_BLOCK_ID - 30 + 31 1073741826 OP_SET_GENSTAMP_V2 - 31 + 32 1002 OP_ADD_BLOCK - 32 + 33 /file_concat_target 1073741825 @@ -391,21 +400,21 @@ OP_ALLOCATE_BLOCK_ID - 33 + 34 1073741827 OP_SET_GENSTAMP_V2 - 34 + 35 1003 OP_ADD_BLOCK - 35 + 36 /file_concat_target 1073741826 @@ -424,13 +433,13 @@ OP_CLOSE - 36 + 37 0 0 /file_concat_target 1 - 1421877811083 - 1421877810972 + 1422406380534 + 1422406380446 512 @@ -451,7 +460,7 @@ 1003 - jing + xyao supergroup 420 @@ -460,44 +469,44 @@ OP_ADD - 37 + 38 0 16390 /file_concat_0 1 - 1421877811086 - 1421877811086 + 1422406380537 + 1422406380537 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 39 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 40 OP_ALLOCATE_BLOCK_ID - 38 + 39 1073741828 OP_SET_GENSTAMP_V2 - 39 + 40 1004 OP_ADD_BLOCK - 40 + 41 /file_concat_0 1073741828 @@ -511,21 +520,21 @@ OP_ALLOCATE_BLOCK_ID - 41 + 42 1073741829 OP_SET_GENSTAMP_V2 - 42 + 43 1005 OP_ADD_BLOCK - 43 + 44 /file_concat_0 1073741828 @@ -544,21 +553,21 @@ OP_ALLOCATE_BLOCK_ID - 44 + 45 1073741830 OP_SET_GENSTAMP_V2 - 45 + 46 1006 OP_ADD_BLOCK - 46 + 47 /file_concat_0 1073741829 @@ -577,13 +586,13 @@ OP_CLOSE - 47 + 48 0 0 /file_concat_0 1 - 1421877811108 - 1421877811086 + 1422406380558 + 1422406380537 512 @@ -604,7 +613,7 @@ 1006 - jing + xyao supergroup 420 @@ -613,44 +622,44 @@ OP_ADD - 48 + 49 0 16391 /file_concat_1 1 - 1421877811110 - 1421877811110 + 1422406380560 + 1422406380560 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 48 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 49 OP_ALLOCATE_BLOCK_ID - 49 + 50 1073741831 OP_SET_GENSTAMP_V2 - 50 + 51 1007 OP_ADD_BLOCK - 51 + 52 /file_concat_1 1073741831 @@ -664,21 +673,21 @@ OP_ALLOCATE_BLOCK_ID - 52 + 53 1073741832 OP_SET_GENSTAMP_V2 - 53 + 54 1008 OP_ADD_BLOCK - 54 + 55 /file_concat_1 1073741831 @@ -697,21 +706,21 @@ OP_ALLOCATE_BLOCK_ID - 55 + 56 1073741833 OP_SET_GENSTAMP_V2 - 56 + 57 1009 OP_ADD_BLOCK - 57 + 58 /file_concat_1 1073741832 @@ -730,13 +739,13 @@ OP_CLOSE - 58 + 59 0 0 /file_concat_1 1 - 1421877811131 - 1421877811110 + 1422406380579 + 1422406380560 512 @@ -757,7 +766,7 @@ 1009 - jing + xyao supergroup 420 @@ -766,59 +775,59 @@ OP_CONCAT_DELETE - 59 + 60 0 /file_concat_target - 1421877811134 + 1422406380582 /file_concat_0 /file_concat_1 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 56 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 57 OP_ADD - 60 + 61 0 16392 /file_create 1 - 1421877811137 - 1421877811137 + 1422406380586 + 1422406380586 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 58 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 59 OP_ALLOCATE_BLOCK_ID - 61 + 62 1073741834 OP_SET_GENSTAMP_V2 - 62 + 63 1010 OP_ADD_BLOCK - 63 + 64 /file_create 1073741834 @@ -832,21 +841,21 @@ OP_ALLOCATE_BLOCK_ID - 64 + 65 1073741835 OP_SET_GENSTAMP_V2 - 65 + 66 1011 OP_ADD_BLOCK - 66 + 67 /file_create 1073741834 @@ -865,13 +874,13 @@ OP_CLOSE - 67 + 68 0 0 /file_create 1 - 1421877811152 - 1421877811137 + 1422406380599 + 1422406380586 512 @@ -887,7 +896,7 @@ 1011 - jing + xyao supergroup 420 @@ -896,74 +905,74 @@ OP_TRUNCATE - 68 + 69 /file_create - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 512 - 1421877811154 + 1422406380601 OP_SYMLINK - 69 + 70 0 16393 /file_symlink /file_concat_target - 1421877811160 - 1421877811160 + 1422406380606 + 1422406380606 - jing + xyao supergroup 511 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 65 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 66 OP_ADD - 70 + 71 0 16394 /hard-lease-recovery-test 1 - 1421877811163 - 1421877811163 + 1422406380608 + 1422406380608 512 - DFSClient_NONMAPREDUCE_-986598042_1 + DFSClient_NONMAPREDUCE_-156773767_1 127.0.0.1 true - jing + xyao supergroup 420 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 66 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 67 OP_ALLOCATE_BLOCK_ID - 71 + 72 1073741836 OP_SET_GENSTAMP_V2 - 72 + 73 1012 OP_ADD_BLOCK - 73 + 74 /hard-lease-recovery-test 1073741836 @@ -977,7 +986,7 @@ OP_UPDATE_BLOCKS - 74 + 75 /hard-lease-recovery-test 1073741836 @@ -991,15 +1000,15 @@ OP_SET_GENSTAMP_V2 - 75 + 76 1013 OP_REASSIGN_LEASE - 76 - DFSClient_NONMAPREDUCE_-986598042_1 + 77 + DFSClient_NONMAPREDUCE_-156773767_1 /hard-lease-recovery-test HDFS_NameNode @@ -1007,13 +1016,13 @@ OP_CLOSE - 77 + 78 0 0 /hard-lease-recovery-test 1 - 1421877813736 - 1421877811163 + 1422406383261 + 1422406380608 512 @@ -1024,7 +1033,7 @@ 1013 - jing + xyao supergroup 420 @@ -1033,72 +1042,72 @@ OP_ADD_CACHE_POOL - 78 + 79 pool1 - jing + xyao staff 493 9223372036854775807 2305843009213693951 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 73 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 74 OP_MODIFY_CACHE_POOL - 79 + 80 pool1 99 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 74 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 75 OP_ADD_CACHE_DIRECTIVE - 80 + 81 1 /path 1 pool1 - 2305844431091508160 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 75 + 2305844431620077592 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 76 OP_MODIFY_CACHE_DIRECTIVE - 81 + 82 1 2 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 76 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 77 OP_REMOVE_CACHE_DIRECTIVE - 82 + 83 1 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 77 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 78 OP_REMOVE_CACHE_POOL - 83 + 84 pool1 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 78 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 79 OP_SET_ACL - 84 + 85 /file_concat_target ACCESS @@ -1131,62 +1140,62 @@ OP_SET_XATTR - 85 + 86 /file_concat_target USER a1 0x313233 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 80 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 81 OP_SET_XATTR - 86 + 87 /file_concat_target USER a2 0x373839 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 81 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 82 OP_REMOVE_XATTR - 87 + 88 /file_concat_target USER a2 - 1730855b-1f27-4f17-9f72-b9f92eb3a8bd - 82 + 7334ec24-dd6b-4efd-807d-ed0d18625534 + 83 OP_ROLLING_UPGRADE_START - 88 - 1421877814254 + 89 + 1422406383706 OP_ROLLING_UPGRADE_FINALIZE - 89 - 1421877814254 + 90 + 1422406383706 OP_END_LOG_SEGMENT - 90 + 91