From 0ad6cdd03149eefbbbeba5df633bae65d4ee8916 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Fri, 21 Feb 2014 20:02:27 +0000 Subject: [PATCH] HDFS-5992. Fix NPE in MD5FileUtils and update editsStored for TestOfflineEditsViewer. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570690 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-hdfs/CHANGES_HDFS-5535.txt | 2 + .../apache/hadoop/hdfs/util/MD5FileUtils.java | 13 +- .../namenode/OfflineEditsViewerHelper.java | 3 + .../TestOfflineEditsViewer.java | 1 + .../src/test/resources/editsStored | Bin 4655 -> 4458 bytes .../src/test/resources/editsStored.xml | 586 ++++-------------- 6 files changed, 121 insertions(+), 484 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt index 99850cb96a..4c567902c8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt @@ -69,3 +69,5 @@ HDFS-5535 subtasks: HDFS-5987. Fix findbugs warnings in Rolling Upgrade branch. (seztszwo via Arpit Agarwal) + HDFS-5992. Fix NPE in MD5FileUtils and update editsStored for + TestOfflineEditsViewer. (szetszwo) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/MD5FileUtils.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/MD5FileUtils.java index 3f37b9049c..d87ffbf315 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/MD5FileUtils.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/MD5FileUtils.java @@ -20,6 +20,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -72,10 +73,6 @@ public static void verifySavedMD5(File dataFile, MD5Hash expectedMD5) * where group(1) is the md5 string and group(2) is the data file path. */ private static Matcher readStoredMd5(File md5File) throws IOException { - if (!md5File.exists()) { - return null; - } - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream( md5File), Charsets.UTF_8)); @@ -105,6 +102,10 @@ private static Matcher readStoredMd5(File md5File) throws IOException { */ public static MD5Hash readStoredMd5ForFile(File dataFile) throws IOException { final File md5File = getDigestFileForFile(dataFile); + if (!md5File.exists()) { + return null; + } + final Matcher matcher = readStoredMd5(md5File); String storedHash = matcher.group(1); File referencedFile = new File(matcher.group(2)); @@ -165,6 +166,10 @@ private static void saveMD5File(File dataFile, String digestString) public static void renameMD5File(File oldDataFile, File newDataFile) throws IOException { final File fromFile = getDigestFileForFile(oldDataFile); + if (!fromFile.exists()) { + throw new FileNotFoundException(fromFile + " does not exist."); + } + final String digestString = readStoredMd5(fromFile).group(1); saveMD5File(newDataFile, digestString); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java index c1cdb76778..c6364b174d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java @@ -130,7 +130,10 @@ private CheckpointSignature runOperations() throws IOException { DFSTestUtil.runOperations(cluster, dfs, cluster.getConfiguration(0), dfs.getDefaultBlockSize(), 0); + // OP_ROLLING_UPGRADE_START cluster.getNamesystem().getEditLog().logStartRollingUpgrade(Time.now()); + // OP_ROLLING_UPGRADE_FINALIZE + cluster.getNamesystem().getEditLog().logFinalizeRollingUpgrade(Time.now()); // Force a roll so we get an OP_END_LOG_SEGMENT txn return cluster.getNameNodeRpc().rollEditLog(); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java index 00ec2b790d..19d98ab698 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java @@ -95,6 +95,7 @@ public void testGenerated() throws IOException { // edits generated by nnHelper (MiniDFSCluster), should have all op codes // binary, XML, reparsed binary String edits = nnHelper.generateEdits(); + LOG.info("Generated edits=" + edits); String editsParsedXml = folder.newFile("editsParsed.xml").getAbsolutePath(); String editsReparsed = folder.newFile("editsParsed").getAbsolutePath(); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored index 17d6cdf9f5b2a15e51487713cde9a131065eb69a..6c17f4af4a9ec863a56a6b27dec867a38eb6210e 100644 GIT binary patch literal 4458 zcmcgveN0nV6hG~w&=yPa0~9~s6r73`iU^2KpA%GM;H0A4%xoHXNC%~)Eh27C&6Le0 zx=qP8=frI=#~+(9{vpOWqHdWX&Y4WfW?*jqArtTuH8ESXyPvI;3*isrA?bPVo^yWZ z^WJyy`~9teXbk>Aq^XVlX=Mz32Ce3OP1c)T$y)t}&fj({uS(n6n|N*xmr7bH)#>*h zY(8Gqy83)<&mR&qg)sV{Xkl1ViL+d_7kN~NPX!I~kyUW4pgqX3rk1Gdy_-~@cT=_7 z=&h<$J?lO0s!B~G5yfXMu`Molsueza{)+s(MK2d*XB95awp*;$^o*3*>FKHIb}JaH zDe1G4(VrEfzuP>n{@TU7U5Cepo7e2WIuXG{q(NMmf#3n?7>5BOygBp;6WaEDff6GW z9s(Ch(|5TysKpHNjxabwJ#?<2bwH7V!0wUI&iKH2s+HGWPlHe-h)ybYdekDH+f!qA zm7!1ZCr}_T^asj+p~in`<*yBFMqy-MA?PdA>J`-$Dw@>Q6@QhO7{;g&HP9r^JLr7{MN4>LcZ)8H zsm2JJNJP?gKO?#RwK1$$5F3Krf6LjPN9L%7qQfNa!I`U(%rT6n4~h;(vg6KOQRML1 zeGboh)yGdgTOzA5;+USz6pU-X|M3EuIAjOCg2EWTG`iexG1}&E&x>3$B$2#x@2ZVwi6O-PyRUdUk=Z90gVZBDvKu#crfi{_0F&v15)M&) z<}f)BpqmAVI40^;3``WB%7=H_vHPE`k_jHb6wDQXuv0l#b-ZoyR4CoZK2kM<*E%6I z3sOOBiiYC`9f%WqcW#lXF-*l=L7(GTy?7q??hMH8mW0S|~E9gMyIBEFf$O z6r6=s+e^>Lcp1@j{G$MbfA2Ilb3ZfiBJy*q=&cKN+)v^_esshS`P?c9DCp<9CFLxi zxtRnJ{|wa4w*}qg+sXn&91{&j3``WB%DAQeVr=or1P@>q<_fw}HJR63=gmr@Lh1Ip8z=I3vywxz z;Nup7#_cv8w|NKU|72a3Rz;vYszUHAU zWTD*av^08S=?jW?XoVQ01Eyu@zfgO=!=>iCi`6T->e+njEMiVzkf8aQxDJI$#^%We z28%(F*v(S9CvL2!<8(axWWtM}t8}}|@o6*(0_vdi`Wz)CnwwkL&36*x!f9Nlvlg}` zup|}-0r_3MNNAN4``(}XCo`)o#&ITQ&?Qwme5EL58kpxMa(0nx1X5lSFc7J}q_+RwOYQ|oZ7EMoq?s2tx4LW^16vkj6kX*1?#b9Q jovGx|F4}kOIrD8H`}o6hzWA{1+^Eq^Gxx%whN%Am>320H literal 4655 zcmcIodrTBZ82|Q`#~rWpiAYseDEL5x1FHx=mL6{^s8m~R!sUQPDUYLf2YAMYU?ax1 z;SY<|rm2sXRAZHZZDOj{AZksUlon%SOw?*Bjq(s*)x^|ZXLe@pbQuXvbV%;oo!RgA z`)0o1elv^P?d}c((uAhaGb<+28=df>U~YKWwO4+H7L8le>;(=!XrmE}sc(~@71zbtL}%8c|?<_t?xvT0sIa$<6# z#RLXZ;)1ye=+6XWHv66_3~I=W-m$j6skfrL31Rzn-}~XDK_vn3r4~jG(LMSQpJe;H z(9G24$43n$t5IdEQ%VVNugDEmzpE{>h^z;IKXCl?Tt7okN7O=*2B9ZbMilX-<#wgS zX|ua5RTb!(l7}$MUGzce{r1qQ6wELjB>&y57pBqSfZ@YM2j-k)-hso1Q?52fhg0vM z;lp5XR9kBt>upYcGDC{%+iIpz|KO4RJy40-i4anm5vXv5kYff%HwGC6FeNK*O9btlOssgTuk~w*-at5a5^6cb z{?IJm0zk|9Z`^>+BvB;wokPRA6Q^SyGkE$=i+u}Ij{MHxr*h%dwZQPrIzj+|(V7G| zBF1Fd`*o)zAWf}QGJx1vSQy2~s1^I`+fOzzGKov3R#oJ$A;Wo6X+R$$*s_OeaK z!)jwM8#l{a5HQ*jakg<&XXasist;Y_l_V3@^!L$zTK|bs(DVJ=>fUPnEN2fv0Ei?P zvLA%d4Vy%n;E~~08X&T`5pX{6i`c7Y^naf6v7}M~ph~1p*rzk+x-U!Jt7K3d$Y`&f z%~BVwjh|)52MJ_=h~n6vf8$5ya`jQg zhp-8dR|O9*#F{1CjoK{yBcmh8@$!J9jAu6PMESX0vgy|r#uKaMVJgt@cy#CIWjt1_ zf5>zXOi(&sx3D7|ohIU8Ii+zQu_4j%7noNdiaWU~W{x&y$HXF-kNUt+aa zI&Ib9s}c#Fgx&uv7b|`9p_wMOO)sT^;+NP6KJmp?JCeOOXo+moPq;`K-y{~SQMVN2 zEkA`MfG_>DbBu z0TK5l8>?FxWKg{KVE>giR<|-omq{Z4^5R&>oj{2!#yjA#G= 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 25af04c6cb..b3115591d0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml @@ -1,10 +1,6 @@ -<<<<<<< .working - -50 -======= - -51 ->>>>>>> .merge-right.r1559304 + -55 OP_START_LOG_SEGMENT @@ -17,13 +13,8 @@ 2 1 -<<<<<<< .working - 1389421314720 - d2a03d66ebfac521 -======= - 1390519460949 - dc8d30edc97df67d ->>>>>>> .merge-right.r1559304 + 1393648283650 + 76e6d2854a753680 @@ -33,13 +24,8 @@ 3 2 -<<<<<<< .working - 1389421314722 - ef94532092f55aef -======= - 1390519460952 - 096bc20b6debed03 ->>>>>>> .merge-right.r1559304 + 1393648283653 + 939fb7b875c956cd @@ -51,36 +37,18 @@ 16386 /file_create 1 -<<<<<<< .working - 1388730115316 - 1388730115316 -======= - 1389828264873 - 1389828264873 ->>>>>>> .merge-right.r1559304 + 1392957084379 + 1392957084379 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 6 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 9 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 7 @@ -91,22 +59,13 @@ 0 /file_create 1 -<<<<<<< .working - 1388730115327 - 1388730115316 -======= - 1389828265699 - 1389828264873 ->>>>>>> .merge-right.r1559304 + 1392957084397 + 1392957084379 512 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 @@ -119,15 +78,9 @@ 0 /file_create /file_moved -<<<<<<< .working - 1388730115331 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 8 -======= - 1389828265705 - b5928e80-e373-4807-a688-f94483d08ce5 - 11 ->>>>>>> .merge-right.r1559304 + 1392957084400 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 9 @@ -136,15 +89,9 @@ 7 0 /file_moved -<<<<<<< .working - 1388730115336 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 9 -======= - 1389828265712 - b5928e80-e373-4807-a688-f94483d08ce5 - 12 ->>>>>>> .merge-right.r1559304 + 1392957084413 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 10 @@ -154,17 +101,9 @@ 0 16387 /directory_mkdir -<<<<<<< .working - 1388730115342 -======= - 1389828265722 ->>>>>>> .merge-right.r1559304 + 1392957084419 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 493 @@ -197,13 +136,8 @@ 12 /directory_mkdir snapshot1 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 14 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 17 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 15 @@ -213,13 +147,8 @@ /directory_mkdir snapshot1 snapshot2 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 15 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 18 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 16 @@ -228,13 +157,8 @@ 14 /directory_mkdir snapshot2 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 16 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 19 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 17 @@ -245,36 +169,18 @@ 16388 /file_create 1 -<<<<<<< .working - 1388730115362 - 1388730115362 -======= - 1389828265757 - 1389828265757 ->>>>>>> .merge-right.r1559304 + 1392957084440 + 1392957084440 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 17 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 20 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 18 @@ -285,22 +191,13 @@ 0 /file_create 1 -<<<<<<< .working - 1388730115363 - 1388730115362 -======= - 1389828265759 - 1389828265757 ->>>>>>> .merge-right.r1559304 + 1392957084441 + 1392957084440 512 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 @@ -356,19 +253,10 @@ 0 /file_create /file_moved -<<<<<<< .working - 1388730115378 -======= - 1389828265782 ->>>>>>> .merge-right.r1559304 + 1392957084455 NONE -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 24 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 27 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 25 @@ -379,36 +267,18 @@ 16389 /file_concat_target 1 -<<<<<<< .working - 1388730115382 - 1388730115382 -======= - 1389828265787 - 1389828265787 ->>>>>>> .merge-right.r1559304 + 1392957084459 + 1392957084459 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 26 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 29 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 27 @@ -513,13 +383,8 @@ 0 /file_concat_target 1 -<<<<<<< .working - 1388730115461 - 1388730115382 -======= - 1389828266540 - 1389828265787 ->>>>>>> .merge-right.r1559304 + 1392957084525 + 1392957084459 512 @@ -539,11 +404,7 @@ 1003 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 @@ -557,36 +418,18 @@ 16390 /file_concat_0 1 -<<<<<<< .working - 1388730115463 - 1388730115463 -======= - 1389828266544 - 1389828266544 ->>>>>>> .merge-right.r1559304 + 1392957084527 + 1392957084527 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 39 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 41 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 40 @@ -691,13 +534,8 @@ 0 /file_concat_0 1 -<<<<<<< .working - 1388730115477 - 1388730115463 -======= - 1389828266569 - 1389828266544 ->>>>>>> .merge-right.r1559304 + 1392957084542 + 1392957084527 512 @@ -717,11 +555,7 @@ 1006 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 @@ -735,36 +569,18 @@ 16391 /file_concat_1 1 -<<<<<<< .working - 1388730115479 - 1388730115479 -======= - 1389828266572 - 1389828266572 ->>>>>>> .merge-right.r1559304 + 1392957084544 + 1392957084544 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 51 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 53 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 52 @@ -869,13 +685,8 @@ 0 /file_concat_1 1 -<<<<<<< .working - 1388730115495 - 1388730115479 -======= - 1389828266599 - 1389828266572 ->>>>>>> .merge-right.r1559304 + 1392957084559 + 1392957084544 512 @@ -895,11 +706,7 @@ 1009 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 @@ -911,22 +718,13 @@ 56 0 /file_concat_target -<<<<<<< .working - 1388730115498 -======= - 1389828266603 ->>>>>>> .merge-right.r1559304 + 1392957084561 /file_concat_0 /file_concat_1 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 62 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 64 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 63 @@ -937,190 +735,37 @@ 16392 /file_symlink /file_concat_target -<<<<<<< .working - 1388730115502 - 1388730115502 -======= - 1389828266633 - 1389828266633 ->>>>>>> .merge-right.r1559304 + 1392957084564 + 1392957084564 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 511 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 63 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 66 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 64 OP_ADD 58 -<<<<<<< .working - - HDFS_DELEGATION_TOKEN - 1 - szetszwo - JobTracker - - 1388730115505 - 1389334915505 - 2 - - 1388816515505 - - - - OP_RENEW_DELEGATION_TOKEN - - 59 - - HDFS_DELEGATION_TOKEN - 1 - szetszwo - JobTracker - - 1388730115505 - 1389334915505 - 2 - - 1388816515564 - - - - OP_CANCEL_DELEGATION_TOKEN - - 60 - - HDFS_DELEGATION_TOKEN - 1 - szetszwo - JobTracker - - 1388730115505 - 1389334915505 - 2 - - - - - OP_ADD_CACHE_POOL - - 61 - poolparty - szetszwo - staff - 493 - 9223372036854775807 - 2305843009213693951 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 67 - - - - OP_MODIFY_CACHE_POOL - - 62 - poolparty - carlton - party - 448 - 1989 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 68 - - - - OP_ADD_CACHE_DIRECTIVE - - 63 - 1 - /bar - 1 - poolparty - 2305844397943809533 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 69 - - - - OP_MODIFY_CACHE_DIRECTIVE - - 64 - 1 - /bar2 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 70 - - - - OP_REMOVE_CACHE_DIRECTIVE - - 65 - 1 - 8205c453-0c7f-4b25-955a-7786e56bce86 - 71 - - - - OP_REMOVE_CACHE_POOL - - 66 - poolparty - 8205c453-0c7f-4b25-955a-7786e56bce86 - 72 - - - - OP_ADD - - 67 -======= ->>>>>>> .merge-right.r1559304 0 16393 /hard-lease-recovery-test 1 -<<<<<<< .working - 1388730115596 - 1388730115596 -======= - 1389828266637 - 1389828266637 ->>>>>>> .merge-right.r1559304 + 1392957084567 + 1392957084567 512 -<<<<<<< .working - DFSClient_NONMAPREDUCE_381408282_1 -======= - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 127.0.0.1 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - 8205c453-0c7f-4b25-955a-7786e56bce86 - 73 -======= - b5928e80-e373-4807-a688-f94483d08ce5 - 67 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 65 @@ -1175,38 +820,22 @@ OP_REASSIGN_LEASE -<<<<<<< .working - 73 - DFSClient_NONMAPREDUCE_381408282_1 -======= 64 - DFSClient_NONMAPREDUCE_16108824_1 ->>>>>>> .merge-right.r1559304 + DFSClient_NONMAPREDUCE_-1178237747_1 /hard-lease-recovery-test HDFS_NameNode -<<<<<<< .working - OP_CLOSE - - 74 -======= OP_CLOSE 65 ->>>>>>> .merge-right.r1559304 0 0 /hard-lease-recovery-test 1 -<<<<<<< .working - 1388730118281 - 1388730115596 -======= - 1389828269751 - 1389828266637 ->>>>>>> .merge-right.r1559304 + 1392957087263 + 1392957084567 512 @@ -1216,36 +845,24 @@ 1011 -<<<<<<< .working szetszwo -======= - jing ->>>>>>> .merge-right.r1559304 supergroup 420 -<<<<<<< .working - OP_UPGRADE_MARKER - - 75 - - - -======= OP_ADD_CACHE_POOL 66 pool1 - jing + szetszwo staff 493 9223372036854775807 2305843009213693951 - b5928e80-e373-4807-a688-f94483d08ce5 - 74 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 72 @@ -1254,8 +871,8 @@ 67 pool1 99 - b5928e80-e373-4807-a688-f94483d08ce5 - 75 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 73 @@ -1266,9 +883,9 @@ /path 1 pool1 - 2305844399041964876 - b5928e80-e373-4807-a688-f94483d08ce5 - 76 + 2305844402170781554 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 74 @@ -1277,8 +894,8 @@ 69 1 2 - b5928e80-e373-4807-a688-f94483d08ce5 - 77 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 75 @@ -1286,8 +903,8 @@ 70 1 - b5928e80-e373-4807-a688-f94483d08ce5 - 78 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 76 @@ -1295,26 +912,35 @@ 71 pool1 - b5928e80-e373-4807-a688-f94483d08ce5 - 79 - - - ->>>>>>> .merge-right.r1559304 - OP_END_LOG_SEGMENT - -<<<<<<< .working - 76 -======= - 72 ->>>>>>> .merge-right.r1559304 + ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e + 77 OP_SET_ACL + + 72 + /file_concat_target + + + + OP_ROLLING_UPGRADE_START 73 - /file_set_acl + 1392957087621 + + + + OP_ROLLING_UPGRADE_FINALIZE + + 74 + 1392957087621 + + + + OP_END_LOG_SEGMENT + + 75