From 0a736fbc177df0c9d49922ab389c32fda4a06740 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Mon, 21 Jul 2014 13:38:06 +0000
Subject: [PATCH] HDFS-6679. Bump NameNodeLayoutVersion and update editsStored
 test files.  Contributed by vinayakumarb

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612266 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   |   3 +
 .../namenode/NameNodeLayoutVersion.java       |   3 +-
 .../src/test/resources/editsStored            | Bin 4970 -> 4918 bytes
 .../src/test/resources/editsStored.xml        | 212 +++++++++---------
 4 files changed, 111 insertions(+), 107 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e6eac4ce46c..12f10c549e1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -14,6 +14,9 @@ HDFS-6584: Archival Storage
     HDFS-6710. Change BlockPlacementPolicy to consider block storage policy
     in replica deletion.  (szetszwo)
 
+    HDFS-6679. Bump NameNodeLayoutVersion and update editsStored test files.
+    (vinayakumarb via szetszwo)
+
 Trunk (Unreleased)
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
index 6ae2806d8f1..ce6c9dc4667 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
@@ -65,7 +65,8 @@ public class NameNodeLayoutVersion {
   public static enum Feature implements LayoutFeature {
     ROLLING_UPGRADE(-55, -53, "Support rolling upgrade", false),
     EDITLOG_LENGTH(-56, "Add length field to every edit log op"),
-    XATTRS(-57, "Extended attributes");
+    XATTRS(-57, "Extended attributes"),
+    BLOCK_STORAGE_POLICY(-58, "Block Storage policy");
     
     private final FeatureInfo info;
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored
index a3561cda528a9bae7b6fb6e16180ca9a9d344d7a..227f363e2c7d575df6bb27db53818b5af6641ac2 100644
GIT binary patch
delta 1729
zcmaE*woQ%Y|NsBTCbFnnx)-Tk^5a;wyQl8i#LB)cijVJ#GB7a60x<|MGj%b7R0MNe
z`Cz-(Mn}ie=av5~kj(6fNy;+r9-n_GFfcGeX^=P*h+tqUOPaipPsh~Mz}VQ-#K6cf
z-jIRQ(8yfR00<2k1Wr5_ymYF{Y3-b=yCr433mk!3*d9##B*_V61WaaQRMrI<>5Ic?
zuHw>y)S~pF{L%u(C0u5klqW|qYA1kngkm+CLsRk7SCGTZffxkX8MyV+GILVnbMwnm
zQ=qowVb#mo`J}di8K}p5@>51tHIOA$Pz_Z;Um`o@E!b?c9Mdh6O_-)iVDTeg)oJI;
zlOHmfW0U0Xjhv)8*??I`7K=`SRlSqIK|6bLB{L-8_duNiq(Ok}fEP^c+|~*Scv%)m
zz#qV2G_r4(us@l>J-LwOmnJAo9s*s!$bdBjC4RRvZvnY*(c~$tTHrME0%|^x1_2bO
z8<3D@q~_duT(jAVEs>FN{^U9ATD(A~{1Si}KADkMc=9uLM@h7JTEhPBu`bBoxszQu
zR6!2<1x)jxL=2)qfNTe;FJ*k<zxgRg5F_KP$rfCyU<WnA3<o=?mJ8EC(TN}RK=#g^
ze47j6pmwMpAPoX!JIGjn{w$@<HQZnao#%l#=oZXypo2n0&_iecjx9GQ=kj{0fCA(`
z)+n`8?BLT91iCA4@-1F-8<4{1P&1#S8TTKn0rnn0QozN?ipha|2H+@o12q6hg8<n+
zcJMf`j%D&+z7O0;32Aa7pNu%Khl^WqykBB&s$YIe>Ycb!22iRmovbZj0F0+E%x*9j
zOwJHcsYmn25^=_?P8Fc~V36y8z=?siAU{9H5Xh7Vm3It$jw!jBd6~r}MTsT(Ma7J7
z>w#q~2*`uU|JXyqU7|8;l`7B>Q;?xR;0!T$GPfW<wo<~QWo7iL$wq=Y@<1oEy}%l}
zo;%WNbtl&f%DQ7INxUY<pPs4=v`7nV9RmZ<+hD+m)hurZ&z7%~9}0?LbBvF<l62E#
zexY`3l77}Q6JsW?6Eeak=`Z8At6}mFA$wz>H`uL8woLa0xkm)*7D&ktl#sZ{_*NV!
N$ODz|+Za&U3;@%+G4}uf

delta 1705
zcmdm{_DYTA|NsBTC$gwox}9lqzsMo>+57jhYSo}k)7KvoWnf^C1!53jX6j-DskqK@
z`<aGDh}#U~KgLbRKr-_uCMhepE%wiT%D}(~r9t9MAcBD{F)yVkwS3}29aAG?V*_JL
z3uD80Lk3PmBXd0iAT(qUcwp}pWZUY;+UcZ`*!s+JFHjdpN7X(_P9P&>G83b+A<)zu
zemtgg6_*yI7Nr;EmliNCX)^rqW^xdtwme9e7*^xCvbds)C(mJ&RRO6{!m5UQ&w2hn
zW}p-NC*NgM)dDFrfjA+@1nMbdYu^G@GBDiVY0y7egK4S+7C#BNw;w+=`6`n+Hc7z^
zqGA@4RhV^TvFH?PKHwDtGJgK#TxM`s=d6c11xSMcC1EYx8&mTd64tydkg(o~$8=;*
zFJa$tOJi~@%P&n}@Z@p>9m2?fH87=K-1vJG<j`f48(6hKsU;Vfut2E=M1ugj4-801
zEi#HrCVtth#Fog&xOj34yB06d+&rLbAm&fr%^o6)CB~KrbQOt#tX?=-gF_YMraWng
z9uN%zl(<Rr@x3<r%||(c7#ZhHmf%tayD1rF{$wvM>~3-pJZ%HAdg0{lTo5-EK=lA=
z5TL|OrmKIiW!oIW9mL2v4`LdF`D6tyabZJHyn#Y151Ov>3MSv=36a1SYGsz;tdkvi
zJwaI~Zx`0scDQ2yBvKG)L($}Qyygxdg}{;mZ2mDUM*hcYh+}WRs1(SRYbGo58Gxhb
zEYuJn4FZ$|h11)oEnbsP@_pcdrL)Ng`E@xfxWeT@S)p?BcYXs<l$G<r?3`>Opn^3S
zZIZsOuL9KLKe<pq#2V^9Sh>gewjNl%f`B}j{EywUo--Y0U7UPGKnYvf;I;Ni^Owp0
z1av?pTGcJAq2>L)caFwnPeEC12Kel)zkX?QouIfImcqq1FLTBwHK6-7ffxkb8CVPQ
z^K-Bl%zkqDhwn_jE!d9Do&dH0QQyf`LPppm0~ML<CQd#gWN!@gMRi`D?kOcLplu>x
cI~f>!A>mw|U+SMDA`TSfflByo45(}d04v}BuK)l5

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 7e9b8cf5286..0ccec968ae1 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EDITS>
-  <EDITS_VERSION>-57</EDITS_VERSION>
+  <EDITS_VERSION>-58</EDITS_VERSION>
   <RECORD>
     <OPCODE>OP_START_LOG_SEGMENT</OPCODE>
     <DATA>
@@ -13,8 +13,8 @@
       <TXID>2</TXID>
       <DELEGATION_KEY>
         <KEY_ID>1</KEY_ID>
-        <EXPIRY_DATE>1403590428625</EXPIRY_DATE>
-        <KEY>16f34bfba67b2552</KEY>
+        <EXPIRY_DATE>1406369452622</EXPIRY_DATE>
+        <KEY>aabb8c7ee691798e</KEY>
       </DELEGATION_KEY>
     </DATA>
   </RECORD>
@@ -24,8 +24,8 @@
       <TXID>3</TXID>
       <DELEGATION_KEY>
         <KEY_ID>2</KEY_ID>
-        <EXPIRY_DATE>1403590428631</EXPIRY_DATE>
-        <KEY>dbe6282854469833</KEY>
+        <EXPIRY_DATE>1406369452627</EXPIRY_DATE>
+        <KEY>d4f03dbd3c2c2c39</KEY>
       </DELEGATION_KEY>
     </DATA>
   </RECORD>
@@ -37,18 +37,18 @@
       <INODEID>16386</INODEID>
       <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899229669</MTIME>
-      <ATIME>1402899229669</ATIME>
+      <MTIME>1405678254112</MTIME>
+      <ATIME>1405678254112</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>8</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>6</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -59,13 +59,13 @@
       <INODEID>0</INODEID>
       <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899229711</MTIME>
-      <ATIME>1402899229669</ATIME>
+      <MTIME>1405678254157</MTIME>
+      <ATIME>1405678254112</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -78,9 +78,9 @@
       <LENGTH>0</LENGTH>
       <SRC>/file_create</SRC>
       <DST>/file_moved</DST>
-      <TIMESTAMP>1402899229718</TIMESTAMP>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>10</RPC_CALLID>
+      <TIMESTAMP>1405678254165</TIMESTAMP>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>8</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -89,9 +89,9 @@
       <TXID>7</TXID>
       <LENGTH>0</LENGTH>
       <PATH>/file_moved</PATH>
-      <TIMESTAMP>1402899229730</TIMESTAMP>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>11</RPC_CALLID>
+      <TIMESTAMP>1405678254190</TIMESTAMP>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>9</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -101,9 +101,9 @@
       <LENGTH>0</LENGTH>
       <INODEID>16387</INODEID>
       <PATH>/directory_mkdir</PATH>
-      <TIMESTAMP>1402899229748</TIMESTAMP>
+      <TIMESTAMP>1405678254202</TIMESTAMP>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>493</MODE>
       </PERMISSION_STATUS>
@@ -136,8 +136,8 @@
       <TXID>12</TXID>
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTNAME>snapshot1</SNAPSHOTNAME>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>16</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>14</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -147,8 +147,8 @@
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
       <SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>17</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>15</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -157,8 +157,8 @@
       <TXID>14</TXID>
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTNAME>snapshot2</SNAPSHOTNAME>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>18</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>16</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -169,18 +169,18 @@
       <INODEID>16388</INODEID>
       <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899229871</MTIME>
-      <ATIME>1402899229871</ATIME>
+      <MTIME>1405678254268</MTIME>
+      <ATIME>1405678254268</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>19</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>17</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -191,13 +191,13 @@
       <INODEID>0</INODEID>
       <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899229881</MTIME>
-      <ATIME>1402899229871</ATIME>
+      <MTIME>1405678254272</MTIME>
+      <ATIME>1405678254268</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -253,10 +253,10 @@
       <LENGTH>0</LENGTH>
       <SRC>/file_create</SRC>
       <DST>/file_moved</DST>
-      <TIMESTAMP>1402899229963</TIMESTAMP>
+      <TIMESTAMP>1405678254305</TIMESTAMP>
       <OPTIONS>NONE</OPTIONS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>26</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>24</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -267,18 +267,18 @@
       <INODEID>16389</INODEID>
       <PATH>/file_concat_target</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899229981</MTIME>
-      <ATIME>1402899229981</ATIME>
+      <MTIME>1405678254312</MTIME>
+      <ATIME>1405678254312</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>28</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>26</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -383,8 +383,8 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_target</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230219</MTIME>
-      <ATIME>1402899229981</ATIME>
+      <MTIME>1405678254608</MTIME>
+      <ATIME>1405678254312</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -404,7 +404,7 @@
         <GENSTAMP>1003</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -418,18 +418,18 @@
       <INODEID>16390</INODEID>
       <PATH>/file_concat_0</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230235</MTIME>
-      <ATIME>1402899230235</ATIME>
+      <MTIME>1405678254613</MTIME>
+      <ATIME>1405678254613</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>41</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>39</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -534,8 +534,8 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_0</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230307</MTIME>
-      <ATIME>1402899230235</ATIME>
+      <MTIME>1405678254721</MTIME>
+      <ATIME>1405678254613</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -555,7 +555,7 @@
         <GENSTAMP>1006</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -569,18 +569,18 @@
       <INODEID>16391</INODEID>
       <PATH>/file_concat_1</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230320</MTIME>
-      <ATIME>1402899230320</ATIME>
+      <MTIME>1405678254727</MTIME>
+      <ATIME>1405678254727</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>53</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>51</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -685,8 +685,8 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_1</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230383</MTIME>
-      <ATIME>1402899230320</ATIME>
+      <MTIME>1405678254810</MTIME>
+      <ATIME>1405678254727</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -706,7 +706,7 @@
         <GENSTAMP>1009</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -718,13 +718,13 @@
       <TXID>56</TXID>
       <LENGTH>0</LENGTH>
       <TRG>/file_concat_target</TRG>
-      <TIMESTAMP>1402899230394</TIMESTAMP>
+      <TIMESTAMP>1405678254815</TIMESTAMP>
       <SOURCES>
         <SOURCE1>/file_concat_0</SOURCE1>
         <SOURCE2>/file_concat_1</SOURCE2>
       </SOURCES>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>64</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>62</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -735,15 +735,15 @@
       <INODEID>16392</INODEID>
       <PATH>/file_symlink</PATH>
       <VALUE>/file_concat_target</VALUE>
-      <MTIME>1402899230406</MTIME>
-      <ATIME>1402899230406</ATIME>
+      <MTIME>1405678254823</MTIME>
+      <ATIME>1405678254823</ATIME>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>511</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>65</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>63</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -754,18 +754,18 @@
       <INODEID>16393</INODEID>
       <PATH>/hard-lease-recovery-test</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899230413</MTIME>
-      <ATIME>1402899230413</ATIME>
+      <MTIME>1405678254828</MTIME>
+      <ATIME>1405678254828</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
-      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1503354021_1</CLIENT_NAME>
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>66</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>64</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -821,7 +821,7 @@
     <OPCODE>OP_REASSIGN_LEASE</OPCODE>
     <DATA>
       <TXID>64</TXID>
-      <LEASEHOLDER>DFSClient_NONMAPREDUCE_1233039831_1</LEASEHOLDER>
+      <LEASEHOLDER>DFSClient_NONMAPREDUCE_1503354021_1</LEASEHOLDER>
       <PATH>/hard-lease-recovery-test</PATH>
       <NEWHOLDER>HDFS_NameNode</NEWHOLDER>
     </DATA>
@@ -834,8 +834,8 @@
       <INODEID>0</INODEID>
       <PATH>/hard-lease-recovery-test</PATH>
       <REPLICATION>1</REPLICATION>
-      <MTIME>1402899232526</MTIME>
-      <ATIME>1402899230413</ATIME>
+      <MTIME>1405678256966</MTIME>
+      <ATIME>1405678254828</ATIME>
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -845,7 +845,7 @@
         <GENSTAMP>1011</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
-        <USERNAME>andrew</USERNAME>
+        <USERNAME>vb</USERNAME>
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -856,13 +856,13 @@
     <DATA>
       <TXID>66</TXID>
       <POOLNAME>pool1</POOLNAME>
-      <OWNERNAME>andrew</OWNERNAME>
-      <GROUPNAME>andrew</GROUPNAME>
+      <OWNERNAME>vb</OWNERNAME>
+      <GROUPNAME>Administrators</GROUPNAME>
       <MODE>493</MODE>
       <LIMIT>9223372036854775807</LIMIT>
       <MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>73</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>71</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -871,8 +871,8 @@
       <TXID>67</TXID>
       <POOLNAME>pool1</POOLNAME>
       <LIMIT>99</LIMIT>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>74</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>72</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -883,9 +883,9 @@
       <PATH>/path</PATH>
       <REPLICATION>1</REPLICATION>
       <POOL>pool1</POOL>
-      <EXPIRATION>2305844412112927450</EXPIRATION>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>75</RPC_CALLID>
+      <EXPIRATION>2305844414891951848</EXPIRATION>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>73</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -894,8 +894,8 @@
       <TXID>69</TXID>
       <ID>1</ID>
       <REPLICATION>2</REPLICATION>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>76</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>74</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -903,8 +903,8 @@
     <DATA>
       <TXID>70</TXID>
       <ID>1</ID>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>77</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>75</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -912,8 +912,8 @@
     <DATA>
       <TXID>71</TXID>
       <POOLNAME>pool1</POOLNAME>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>78</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>76</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -959,8 +959,8 @@
         <NAME>a1</NAME>
         <VALUE>0x313233</VALUE>
       </XATTR>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>80</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>78</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -973,8 +973,8 @@
         <NAME>a2</NAME>
         <VALUE>0x373839</VALUE>
       </XATTR>
-      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
-      <RPC_CALLID>81</RPC_CALLID>
+      <RPC_CLIENTID>c8e311d2-ca7a-42ad-9cd5-bb191c4b7041</RPC_CLIENTID>
+      <RPC_CALLID>79</RPC_CALLID>
     </DATA>
   </RECORD>
   <RECORD>
@@ -992,14 +992,14 @@
     <OPCODE>OP_ROLLING_UPGRADE_START</OPCODE>
     <DATA>
       <TXID>76</TXID>
-      <STARTTIME>1402899233646</STARTTIME>
+      <STARTTIME>1405678257978</STARTTIME>
     </DATA>
   </RECORD>
   <RECORD>
     <OPCODE>OP_ROLLING_UPGRADE_FINALIZE</OPCODE>
     <DATA>
       <TXID>77</TXID>
-      <FINALIZETIME>1402899233647</FINALIZETIME>
+      <FINALIZETIME>1405678257978</FINALIZETIME>
     </DATA>
   </RECORD>
   <RECORD>