From 486a76a39ba236072c2bb22af509a1ae8081093e Mon Sep 17 00:00:00 2001 From: arp Date: Sat, 20 Sep 2014 16:58:58 -0700 Subject: [PATCH] HDFS-7071. Updated editsStored and editsStored.xml to bump layout version and add LazyPersist flag. (Contributed by Xiaoyu Yao and Arpit Agarwal) --- .../hadoop-hdfs/CHANGES-HDFS-6581.txt | 4 + .../src/test/resources/editsStored | Bin 4999 -> 5199 bytes .../src/test/resources/editsStored.xml | 270 ++++++++++-------- 3 files changed, 153 insertions(+), 121 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt index 6675775065d..6643b1fede2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt @@ -64,4 +64,8 @@ HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal) + HDFS-7071. Updated editsStored and editsStored.xml to bump layout + version and add LazyPersist flag. (Xiaoyu Yao and Arpit Agarwal via + Arpit Agarwal) + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored index ecfbb9f5fca4ac9963cf30205afd3cd0ea5a9838..7234a0b6399d12b8e9cc0ac0b8720809ea5bfdac 100644 GIT binary patch literal 5199 zcmcgw4NMeA6rQ`~j)OaX1QmZk4{Sy24;-RERaiunDuQ5Jts2h@EP^6O?hdUIt!-*; zv>0MzscE%FwEnajV~njo)yCGgNmG-?rY6?fsx?vY50sQ@)9ZV)Gk1H(KsBj8a{G2? z-n{S4n{VFE;`MsJCLsObXTci~U2Wdo&-%bk0(~SzuUoGxIJx_W22(@BpnK<~x9#(G z8~)H*NP5+x(e&5l`44YiR8|~sJ6VUrcQGF!s+RS{l2TDst=P+4io>H29pDvg_T2x@ zuhCM^h7n?NI2Jiv%N^C>?z&pVwaDeHtJUpPyOSnQnUz;vrPO%rMa4xka%Yz2Pkt#c z-=3a1E-N!VGb7V(BVo3*jM1s^XVa1B_y>DK?2f_*>n@#rdFz-$Gq?#&xVE7_3~uH! zNCVT55MiVb9xu|vCGVaa1uh3Nx5hxXmbyRRzX?eo`K&)Qu%DRKAeK6pDdj41hfz3@ z@GRHwUt-=em?x8HY_xE!xo@j!y9DD(*jP*mh%Axll=3QK)5fa|j+v`_K4`MerF?Th|AJ+PT){CX9NqqJz%>%$o4g-qlYC^)? zHI7<$rPE^*rXc!s;)uw27(b2qi0s*i&t00(U9bK7j&8*@=OIP)AIImW$fR-MnM~=T3irLqGgX94fRg&EG^0~>;RNow`0vy5M?5LCS-Up z3eAxWD3mjRqdN3+=0L_5IxDntOj`P6LX77pe)5wRa|9THNVkicDzdbgBfG;iP)vFr zkinrJ^TdTy+mWZVbb-c0k}5$t@~wPfH!II6if;%I&InAXI#JY`c3&_-?YG4Yx^3Hf z2Q4{8S)rFhgQjfr1zOAk1&zW3dh!$+%aLR4je0&4-&z5ZlXe2)%kUwjE4dh=B`qu6Qv2FMT?3MqWtL?3FhRaE!(nH(t2^_+ zE%yREP4VG5k22is8@{V*VZbW}LPe48-P_$~OJBH~OP>kJC6Dq(?O|;q3gFw_UgTJ+ z6gkV4#P<>d(lJSek?!Y>-E#tQ*%uATBY^{Zm|l>j?)1Jk+{>@A8BAsxPM`n9pgQxl zZW!cW0o5D+Ljgp(FXZ;lH50dW;-O(CwZd5$YMst%*mPvD|M)@-ZjYm)LU-#msI@4A z>D4RV8q-D&TRk5S9JC;Up5k|kA3P{!!c8@O^_lE(Nzgro8WA#;X`EFQF{IQwJeBZH zQ)9H^@vzP^Rp_d)asSm{@Su{)Toh0!r-zFTJWjvF{{2pH1S2Iv=jgGA;A(_xXixjh1R^ z?zg(KwmisQXEoc(ZI(K#>Ig%Ln>lMic6Ft>)=^SeR9G;5UUAOMMcFwe#+0m3q|LlGQy(T%lKESh{=oop8WsP|iXS6AHK${d96ORLx#*ws2 zZPzKb4IJA4-4+4b74Wt=5FnyJ!V*_i+RUX6i*0>LO%=RzCpJskCo1i<>4r1Q{V`*P z(l0`Se37>PUVIv>B@>;mNzUlDy>b-2uSs;~lEaaJlEsOFeN9N9z1C#4S6CcI#qNhJ z8PVAt4ejS}jF7%DTyV*XaG{eXu_dwb=uIP^xEF=5O#(a$SCq#3h| z#{)FVOPDd?P4|w!FP|~tj2fQGGiJ~8x%k=siCb}fz<{7cc*BL~@6ZK6g=Emr(?I34 zKD)e03kLDn9HhUe0nyf)*A}gofNSgUMKGNXP&$Q=%G|@sa%%@SN(ye?K`N z0;UtV`9Oup(kkIECzpzT|K16OGAXwPc`+zV@DpGTaaCHT2LGw4N<@aE_yEDB8bs8P zetem-)RvkYB@UCV-0W~IsEvH=L8H8c^oX>?uFEt4SAQe~8G;WH{8)bf;)+;!mnv}f zf(Q>Eo*Shb25+hK8`n&wKH+LfaY%#kkPsN=|5`qe+hBlF36W-o2;HpT_|pe+D!zva zt^L1`T8C6K;16Y}A{8Ab5nOIiGcro7-llSb6G(h7BYKSinoGpUg}w=2cip-oCpKUO zl(${@L|-K*9@ZzZni98SQxRIbi8sD8xe4dqA*=!!&J;YAhD=I>X4ur}{whxcT=x+j zx`d);3c`UeqN~7F?(&8iy2{&pc7h{eJ586+>L4>EbVUPDe-h%6tVu2hVWyyi%{XH~ z7`QJmt9>CG|ENvpei>;1Kq-bJ5L_h0ud6G3wLFF+u>zv-sAB2uw=jluB7%m~=VIXsiI1_KtqKS;#VteiJgrn}rUJ2rM*7 z==lo1H0~s6O#4!0AZ|{&$bpIf&1ololyi;)BM_mZa93HnoO66{oEpkWw|Wr(-JBP0 zwH(C6+=qZ52~5GWw~)iI`h;A{N!$lOSQ_Ba zw3LehUJe>vISCP=4)Vw_XMBMf-V4delr<-gjWqzElr1#VL_z{uKfN0)k6aRC6&?@L zY!~D?Y4q-nl#>CFlaEv799t!9+r|qxP4bm$Rf`1q^@Z;VsQ6^885kW}$;4 zf}=D)fQJFP^W*8JdW!){rJhaXCV{EXGVaScCt(F}b{z=2-YVxz>y1-OIXkhHNJyZY z^X|e6@$#IUj3!h(bJ891844knauSaoAhf5TaWGjYQOn9*j(C-K`KC@(+=3tQfLF>) zNxJeXj^LgiCwYAvx!*a8hlk9LDJ>0nO0#mFDNKu663o_P`}&&d%G#=4=;}J5-Uu$RSDH*lii#EmkhY$*w!aF%y!qgrFkxA1C7E4 z-G})It9>DJPn@c{@3E&(MQ{;rFsk{t{p1ySIX}I(O0sY4`y4H-wfL?N-TXkm9unq+v(CBxWUu)2=q)hAYLUiyFCa^4ObDqDi!x92KyaF#im+_g6JFf7>(g(xl%`!z~^=@`ePUFd-J$;UUrbu0W-p1OTx%t z{|G(P!~N>)W*d~Mpi~W7O>6zN0%)@L(6Tdla-+6Z8Am*#^e;mz85yG zxqexWl;0;(a-@(pIb9K{DEj!*tnuKF$bFg{qwEuO6ns*?w9ji0?>xY9l{U8mmgHCG e?Ra86iSdyt3Z;r`W!JY4f(kvSExNKeZ@~Yr3z!A~ 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 8cafa9f2fa0..56c435d59fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml @@ -13,8 +13,8 @@ 2 1 - 1410915997709 - 309e81e09dc6c75a + 1411947941261 + 8d8d1ef3d703885f @@ -24,8 +24,8 @@ 3 2 - 1410915997711 - 8a2399843e754bee + 1411947941264 + f9e15cfbecdc6579 @@ -37,19 +37,20 @@ 16386 /file_create 1 - 1410224798292 - 1410224798292 + 1411256743112 + 1411256743112 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 5 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 7 @@ -60,14 +61,15 @@ 0 /file_create 1 - 1410224798315 - 1410224798292 + 1411256743162 + 1411256743112 512 + false false - jing + aagarwal supergroup 420 @@ -88,9 +90,9 @@ 0 /file_create /file_moved - 1410224798322 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 8 + 1411256743174 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 10 @@ -99,9 +101,9 @@ 8 0 /file_moved - 1410224798328 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 9 + 1411256743184 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 11 @@ -111,9 +113,9 @@ 0 16387 /directory_mkdir - 1410224798335 + 1411256743193 - jing + aagarwal supergroup 493 @@ -146,8 +148,8 @@ 13 /directory_mkdir snapshot1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 14 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 16 @@ -157,8 +159,8 @@ /directory_mkdir snapshot1 snapshot2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 15 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 17 @@ -167,8 +169,8 @@ 15 /directory_mkdir snapshot2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 16 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 18 @@ -179,19 +181,20 @@ 16388 /file_create 1 - 1410224798359 - 1410224798359 + 1411256743237 + 1411256743237 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 17 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 19 @@ -202,14 +205,15 @@ 0 /file_create 1 - 1410224798361 - 1410224798359 + 1411256743239 + 1411256743237 512 + false false - jing + aagarwal supergroup 420 @@ -265,10 +269,10 @@ 0 /file_create /file_moved - 1410224798379 + 1411256743285 NONE - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 24 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 26 @@ -279,19 +283,20 @@ 16389 /file_concat_target 1 - 1410224798382 - 1410224798382 + 1411256743290 + 1411256743290 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 26 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 28 @@ -396,9 +401,10 @@ 0 /file_concat_target 1 - 1410224798476 - 1410224798382 + 1411256743982 + 1411256743290 512 + false false @@ -418,7 +424,7 @@ 1003 - jing + aagarwal supergroup 420 @@ -432,19 +438,20 @@ 16390 /file_concat_0 1 - 1410224798479 - 1410224798479 + 1411256743986 + 1411256743986 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 39 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 41 @@ -549,9 +556,10 @@ 0 /file_concat_0 1 - 1410224798501 - 1410224798479 + 1411256744012 + 1411256743986 512 + false false @@ -571,7 +579,7 @@ 1006 - jing + aagarwal supergroup 420 @@ -585,19 +593,20 @@ 16391 /file_concat_1 1 - 1410224798504 - 1410224798504 + 1411256744015 + 1411256744015 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 51 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 53 @@ -702,9 +711,10 @@ 0 /file_concat_1 1 - 1410224798530 - 1410224798504 + 1411256744037 + 1411256744015 512 + false false @@ -724,7 +734,7 @@ 1009 - jing + aagarwal supergroup 420 @@ -736,13 +746,13 @@ 57 0 /file_concat_target - 1410224798533 + 1411256744046 /file_concat_0 /file_concat_1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 62 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 64 @@ -753,15 +763,15 @@ 16392 /file_symlink /file_concat_target - 1410224798537 - 1410224798537 + 1411256744061 + 1411256744061 - jing + aagarwal supergroup 511 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 63 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 65 @@ -772,19 +782,20 @@ 16393 /hard-lease-recovery-test 1 - 1410224798540 - 1410224798540 + 1411256744064 + 1411256744064 512 - DFSClient_NONMAPREDUCE_1374813776_1 + false + DFSClient_NONMAPREDUCE_486984878_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 64 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 66 @@ -840,7 +851,23 @@ OP_REASSIGN_LEASE 65 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_486984878_1 + /hard-lease-recovery-test + HDFS_NameNode + + + + OP_SET_GENSTAMP_V2 + + 66 + 1012 + + + + OP_REASSIGN_LEASE + + 67 + HDFS_NameNode /hard-lease-recovery-test HDFS_NameNode @@ -848,24 +875,25 @@ OP_CLOSE - 66 + 68 0 0 /hard-lease-recovery-test 1 - 1410224801265 - 1410224798540 + 1411256749029 + 1411256744064 512 + false false 1073741834 11 - 1011 + 1012 - jing + aagarwal supergroup 420 @@ -874,72 +902,72 @@ OP_ADD_CACHE_POOL - 67 + 69 pool1 - jing + aagarwal staff 493 9223372036854775807 2305843009213693951 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 71 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 74 OP_MODIFY_CACHE_POOL - 68 + 70 pool1 99 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 72 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 75 OP_ADD_CACHE_DIRECTIVE - 69 + 71 1 /path 1 pool1 - 2305844419438495525 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 73 + 2305844420470443079 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 76 OP_MODIFY_CACHE_DIRECTIVE - 70 + 72 1 2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 74 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 77 OP_REMOVE_CACHE_DIRECTIVE - 71 + 73 1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 75 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 78 OP_REMOVE_CACHE_POOL - 72 + 74 pool1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 76 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 79 OP_SET_ACL - 73 + 75 /file_concat_target ACCESS @@ -972,62 +1000,62 @@ OP_SET_XATTR - 74 + 76 /file_concat_target USER a1 0x313233 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 78 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 81 OP_SET_XATTR - 75 + 77 /file_concat_target USER a2 0x373839 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 79 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 82 OP_REMOVE_XATTR - 76 + 78 /file_concat_target USER a2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 80 + 1cfaa904-5f61-4cfa-87de-ce569d334c0b + 83 OP_ROLLING_UPGRADE_START - 77 - 1410224801616 + 79 + 1411256749298 OP_ROLLING_UPGRADE_FINALIZE - 78 - 1410224801616 + 80 + 1411256749298 OP_END_LOG_SEGMENT - 79 + 81