diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
index 6675775065..6643b1fede 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 ecfbb9f5fc..7234a0b639 100644
Binary files a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored and b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored differ
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 8cafa9f2fa..56c435d59f 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