hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1559305 [2/2] - in /hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/ src/main/java/org/apache/hadoop/hdfs/ src/main/java/org/apache/hadoop/hdfs/protocol/ src/main/java/org/apache/hadoop/hdfs/security/toke...
Date Sat, 18 Jan 2014 02:24:40 GMT
Modified: hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml?rev=1559305&r1=1559304&r2=1559305&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
(original)
+++ hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
Sat Jan 18 02:24:38 2014
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EDITS>
+<<<<<<< .working
   <EDITS_VERSION>-50</EDITS_VERSION>
+=======
+  <EDITS_VERSION>-51</EDITS_VERSION>
+>>>>>>> .merge-right.r1559304
   <RECORD>
     <OPCODE>OP_START_LOG_SEGMENT</OPCODE>
     <DATA>
@@ -13,8 +17,13 @@
       <TXID>2</TXID>
       <DELEGATION_KEY>
         <KEY_ID>1</KEY_ID>
+<<<<<<< .working
         <EXPIRY_DATE>1389421314720</EXPIRY_DATE>
         <KEY>d2a03d66ebfac521</KEY>
+=======
+        <EXPIRY_DATE>1390519460949</EXPIRY_DATE>
+        <KEY>dc8d30edc97df67d</KEY>
+>>>>>>> .merge-right.r1559304
       </DELEGATION_KEY>
     </DATA>
   </RECORD>
@@ -24,8 +33,13 @@
       <TXID>3</TXID>
       <DELEGATION_KEY>
         <KEY_ID>2</KEY_ID>
+<<<<<<< .working
         <EXPIRY_DATE>1389421314722</EXPIRY_DATE>
         <KEY>ef94532092f55aef</KEY>
+=======
+        <EXPIRY_DATE>1390519460952</EXPIRY_DATE>
+        <KEY>096bc20b6debed03</KEY>
+>>>>>>> .merge-right.r1559304
       </DELEGATION_KEY>
     </DATA>
   </RECORD>
@@ -35,20 +49,38 @@
       <TXID>4</TXID>
       <LENGTH>0</LENGTH>
       <INODEID>16386</INODEID>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115316</MTIME>
       <ATIME>1388730115316</ATIME>
+=======
+      <MTIME>1389828264873</MTIME>
+      <ATIME>1389828264873</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>6</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>9</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -57,15 +89,24 @@
       <TXID>5</TXID>
       <LENGTH>0</LENGTH>
       <INODEID>0</INODEID>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115327</MTIME>
       <ATIME>1388730115316</ATIME>
+=======
+      <MTIME>1389828265699</MTIME>
+      <ATIME>1389828264873</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -76,11 +117,17 @@
     <DATA>
       <TXID>6</TXID>
       <LENGTH>0</LENGTH>
-      <SRC>/file_create_u\0001;F431</SRC>
+      <SRC>/file_create</SRC>
       <DST>/file_moved</DST>
+<<<<<<< .working
       <TIMESTAMP>1388730115331</TIMESTAMP>
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>8</RPC_CALLID>
+=======
+      <TIMESTAMP>1389828265705</TIMESTAMP>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>11</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -89,9 +136,15 @@
       <TXID>7</TXID>
       <LENGTH>0</LENGTH>
       <PATH>/file_moved</PATH>
+<<<<<<< .working
       <TIMESTAMP>1388730115336</TIMESTAMP>
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>9</RPC_CALLID>
+=======
+      <TIMESTAMP>1389828265712</TIMESTAMP>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>12</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -101,9 +154,17 @@
       <LENGTH>0</LENGTH>
       <INODEID>16387</INODEID>
       <PATH>/directory_mkdir</PATH>
+<<<<<<< .working
       <TIMESTAMP>1388730115342</TIMESTAMP>
+=======
+      <TIMESTAMP>1389828265722</TIMESTAMP>
+>>>>>>> .merge-right.r1559304
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>493</MODE>
       </PERMISSION_STATUS>
@@ -136,8 +197,13 @@
       <TXID>12</TXID>
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTNAME>snapshot1</SNAPSHOTNAME>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>14</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>17</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -147,8 +213,13 @@
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
       <SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>15</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>18</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -157,8 +228,13 @@
       <TXID>14</TXID>
       <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
       <SNAPSHOTNAME>snapshot2</SNAPSHOTNAME>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>16</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>19</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -167,20 +243,38 @@
       <TXID>15</TXID>
       <LENGTH>0</LENGTH>
       <INODEID>16388</INODEID>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115362</MTIME>
       <ATIME>1388730115362</ATIME>
+=======
+      <MTIME>1389828265757</MTIME>
+      <ATIME>1389828265757</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>17</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>20</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -189,15 +283,24 @@
       <TXID>16</TXID>
       <LENGTH>0</LENGTH>
       <INODEID>0</INODEID>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115363</MTIME>
       <ATIME>1388730115362</ATIME>
+=======
+      <MTIME>1389828265759</MTIME>
+      <ATIME>1389828265757</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -207,7 +310,7 @@
     <OPCODE>OP_SET_REPLICATION</OPCODE>
     <DATA>
       <TXID>17</TXID>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <REPLICATION>1</REPLICATION>
     </DATA>
   </RECORD>
@@ -215,7 +318,7 @@
     <OPCODE>OP_SET_PERMISSIONS</OPCODE>
     <DATA>
       <TXID>18</TXID>
-      <SRC>/file_create_u\0001;F431</SRC>
+      <SRC>/file_create</SRC>
       <MODE>511</MODE>
     </DATA>
   </RECORD>
@@ -223,7 +326,7 @@
     <OPCODE>OP_SET_OWNER</OPCODE>
     <DATA>
       <TXID>19</TXID>
-      <SRC>/file_create_u\0001;F431</SRC>
+      <SRC>/file_create</SRC>
       <USERNAME>newOwner</USERNAME>
     </DATA>
   </RECORD>
@@ -232,7 +335,7 @@
     <DATA>
       <TXID>20</TXID>
       <LENGTH>0</LENGTH>
-      <PATH>/file_create_u\0001;F431</PATH>
+      <PATH>/file_create</PATH>
       <MTIME>1285195527000</MTIME>
       <ATIME>1285195527000</ATIME>
     </DATA>
@@ -251,12 +354,21 @@
     <DATA>
       <TXID>22</TXID>
       <LENGTH>0</LENGTH>
-      <SRC>/file_create_u\0001;F431</SRC>
+      <SRC>/file_create</SRC>
       <DST>/file_moved</DST>
+<<<<<<< .working
       <TIMESTAMP>1388730115378</TIMESTAMP>
+=======
+      <TIMESTAMP>1389828265782</TIMESTAMP>
+>>>>>>> .merge-right.r1559304
       <OPTIONS>NONE</OPTIONS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>24</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>27</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -267,18 +379,36 @@
       <INODEID>16389</INODEID>
       <PATH>/file_concat_target</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115382</MTIME>
       <ATIME>1388730115382</ATIME>
+=======
+      <MTIME>1389828265787</MTIME>
+      <ATIME>1389828265787</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>26</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>29</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -296,7 +426,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>26</TXID>
       <PATH>/file_concat_target</PATH>
@@ -324,7 +454,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>29</TXID>
       <PATH>/file_concat_target</PATH>
@@ -357,16 +487,11 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>32</TXID>
       <PATH>/file_concat_target</PATH>
       <BLOCK>
-        <BLOCK_ID>1073741825</BLOCK_ID>
-        <NUM_BYTES>512</NUM_BYTES>
-        <GENSTAMP>1001</GENSTAMP>
-      </BLOCK>
-      <BLOCK>
         <BLOCK_ID>1073741826</BLOCK_ID>
         <NUM_BYTES>512</NUM_BYTES>
         <GENSTAMP>1002</GENSTAMP>
@@ -388,8 +513,13 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_target</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115461</MTIME>
       <ATIME>1388730115382</ATIME>
+=======
+      <MTIME>1389828266540</MTIME>
+      <ATIME>1389828265787</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -409,7 +539,11 @@
         <GENSTAMP>1003</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -423,18 +557,36 @@
       <INODEID>16390</INODEID>
       <PATH>/file_concat_0</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115463</MTIME>
       <ATIME>1388730115463</ATIME>
+=======
+      <MTIME>1389828266544</MTIME>
+      <ATIME>1389828266544</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>39</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>41</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -452,7 +604,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>37</TXID>
       <PATH>/file_concat_0</PATH>
@@ -480,7 +632,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>40</TXID>
       <PATH>/file_concat_0</PATH>
@@ -513,16 +665,11 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>43</TXID>
       <PATH>/file_concat_0</PATH>
       <BLOCK>
-        <BLOCK_ID>1073741828</BLOCK_ID>
-        <NUM_BYTES>512</NUM_BYTES>
-        <GENSTAMP>1004</GENSTAMP>
-      </BLOCK>
-      <BLOCK>
         <BLOCK_ID>1073741829</BLOCK_ID>
         <NUM_BYTES>512</NUM_BYTES>
         <GENSTAMP>1005</GENSTAMP>
@@ -544,8 +691,13 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_0</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115477</MTIME>
       <ATIME>1388730115463</ATIME>
+=======
+      <MTIME>1389828266569</MTIME>
+      <ATIME>1389828266544</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -565,7 +717,11 @@
         <GENSTAMP>1006</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -579,18 +735,36 @@
       <INODEID>16391</INODEID>
       <PATH>/file_concat_1</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115479</MTIME>
       <ATIME>1388730115479</ATIME>
+=======
+      <MTIME>1389828266572</MTIME>
+      <ATIME>1389828266572</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>51</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>53</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -608,7 +782,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>48</TXID>
       <PATH>/file_concat_1</PATH>
@@ -636,7 +810,7 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>51</TXID>
       <PATH>/file_concat_1</PATH>
@@ -669,16 +843,11 @@
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
       <TXID>54</TXID>
       <PATH>/file_concat_1</PATH>
       <BLOCK>
-        <BLOCK_ID>1073741831</BLOCK_ID>
-        <NUM_BYTES>512</NUM_BYTES>
-        <GENSTAMP>1007</GENSTAMP>
-      </BLOCK>
-      <BLOCK>
         <BLOCK_ID>1073741832</BLOCK_ID>
         <NUM_BYTES>512</NUM_BYTES>
         <GENSTAMP>1008</GENSTAMP>
@@ -700,8 +869,13 @@
       <INODEID>0</INODEID>
       <PATH>/file_concat_1</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115495</MTIME>
       <ATIME>1388730115479</ATIME>
+=======
+      <MTIME>1389828266599</MTIME>
+      <ATIME>1389828266572</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -721,7 +895,11 @@
         <GENSTAMP>1009</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
@@ -733,13 +911,22 @@
       <TXID>56</TXID>
       <LENGTH>0</LENGTH>
       <TRG>/file_concat_target</TRG>
+<<<<<<< .working
       <TIMESTAMP>1388730115498</TIMESTAMP>
+=======
+      <TIMESTAMP>1389828266603</TIMESTAMP>
+>>>>>>> .merge-right.r1559304
       <SOURCES>
         <SOURCE1>/file_concat_0</SOURCE1>
         <SOURCE2>/file_concat_1</SOURCE2>
       </SOURCES>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>62</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>64</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
@@ -750,21 +937,36 @@
       <INODEID>16392</INODEID>
       <PATH>/file_symlink</PATH>
       <VALUE>/file_concat_target</VALUE>
+<<<<<<< .working
       <MTIME>1388730115502</MTIME>
       <ATIME>1388730115502</ATIME>
+=======
+      <MTIME>1389828266633</MTIME>
+      <ATIME>1389828266633</ATIME>
+>>>>>>> .merge-right.r1559304
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>511</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>63</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>66</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_GET_DELEGATION_TOKEN</OPCODE>
+    <OPCODE>OP_ADD</OPCODE>
     <DATA>
       <TXID>58</TXID>
+<<<<<<< .working
       <DELEGATION_TOKEN_IDENTIFIER>
         <KIND>HDFS_DELEGATION_TOKEN</KIND>
         <SEQUENCE_NUMBER>1</SEQUENCE_NUMBER>
@@ -883,42 +1085,62 @@
     <OPCODE>OP_ADD</OPCODE>
     <DATA>
       <TXID>67</TXID>
+=======
+>>>>>>> .merge-right.r1559304
       <LENGTH>0</LENGTH>
       <INODEID>16393</INODEID>
       <PATH>/hard-lease-recovery-test</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730115596</MTIME>
       <ATIME>1388730115596</ATIME>
+=======
+      <MTIME>1389828266637</MTIME>
+      <ATIME>1389828266637</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
+<<<<<<< .working
       <CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
+=======
+      <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
+>>>>>>> .merge-right.r1559304
       <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
+<<<<<<< .working
       <RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
       <RPC_CALLID>73</RPC_CALLID>
+=======
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>67</RPC_CALLID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
   <RECORD>
     <OPCODE>OP_ALLOCATE_BLOCK_ID</OPCODE>
     <DATA>
-      <TXID>68</TXID>
+      <TXID>59</TXID>
       <BLOCK_ID>1073741834</BLOCK_ID>
     </DATA>
   </RECORD>
   <RECORD>
     <OPCODE>OP_SET_GENSTAMP_V2</OPCODE>
     <DATA>
-      <TXID>69</TXID>
+      <TXID>60</TXID>
       <GENSTAMPV2>1010</GENSTAMPV2>
     </DATA>
   </RECORD>
   <RECORD>
-    <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
+    <OPCODE>OP_ADD_BLOCK</OPCODE>
     <DATA>
-      <TXID>70</TXID>
+      <TXID>61</TXID>
       <PATH>/hard-lease-recovery-test</PATH>
       <BLOCK>
         <BLOCK_ID>1073741834</BLOCK_ID>
@@ -932,7 +1154,7 @@
   <RECORD>
     <OPCODE>OP_UPDATE_BLOCKS</OPCODE>
     <DATA>
-      <TXID>71</TXID>
+      <TXID>62</TXID>
       <PATH>/hard-lease-recovery-test</PATH>
       <BLOCK>
         <BLOCK_ID>1073741834</BLOCK_ID>
@@ -946,29 +1168,45 @@
   <RECORD>
     <OPCODE>OP_SET_GENSTAMP_V2</OPCODE>
     <DATA>
-      <TXID>72</TXID>
+      <TXID>63</TXID>
       <GENSTAMPV2>1011</GENSTAMPV2>
     </DATA>
   </RECORD>
   <RECORD>
     <OPCODE>OP_REASSIGN_LEASE</OPCODE>
     <DATA>
+<<<<<<< .working
       <TXID>73</TXID>
       <LEASEHOLDER>DFSClient_NONMAPREDUCE_381408282_1</LEASEHOLDER>
+=======
+      <TXID>64</TXID>
+      <LEASEHOLDER>DFSClient_NONMAPREDUCE_16108824_1</LEASEHOLDER>
+>>>>>>> .merge-right.r1559304
       <PATH>/hard-lease-recovery-test</PATH>
       <NEWHOLDER>HDFS_NameNode</NEWHOLDER>
     </DATA>
   </RECORD>
   <RECORD>
+<<<<<<< .working
     <OPCODE>OP_CLOSE</OPCODE>
     <DATA>
       <TXID>74</TXID>
+=======
+    <OPCODE>OP_CLOSE</OPCODE>
+    <DATA>
+      <TXID>65</TXID>
+>>>>>>> .merge-right.r1559304
       <LENGTH>0</LENGTH>
       <INODEID>0</INODEID>
       <PATH>/hard-lease-recovery-test</PATH>
       <REPLICATION>1</REPLICATION>
+<<<<<<< .working
       <MTIME>1388730118281</MTIME>
       <ATIME>1388730115596</ATIME>
+=======
+      <MTIME>1389828269751</MTIME>
+      <ATIME>1389828266637</ATIME>
+>>>>>>> .merge-right.r1559304
       <BLOCKSIZE>512</BLOCKSIZE>
       <CLIENT_NAME></CLIENT_NAME>
       <CLIENT_MACHINE></CLIENT_MACHINE>
@@ -978,22 +1216,98 @@
         <GENSTAMP>1011</GENSTAMP>
       </BLOCK>
       <PERMISSION_STATUS>
+<<<<<<< .working
         <USERNAME>szetszwo</USERNAME>
+=======
+        <USERNAME>jing</USERNAME>
+>>>>>>> .merge-right.r1559304
         <GROUPNAME>supergroup</GROUPNAME>
         <MODE>420</MODE>
       </PERMISSION_STATUS>
     </DATA>
   </RECORD>
   <RECORD>
+<<<<<<< .working
     <OPCODE>OP_UPGRADE_MARKER</OPCODE>
     <DATA>
       <TXID>75</TXID>
     </DATA>
   </RECORD>
   <RECORD>
+=======
+    <OPCODE>OP_ADD_CACHE_POOL</OPCODE>
+    <DATA>
+      <TXID>66</TXID>
+      <POOLNAME>pool1</POOLNAME>
+      <OWNERNAME>jing</OWNERNAME>
+      <GROUPNAME>staff</GROUPNAME>
+      <MODE>493</MODE>
+      <LIMIT>9223372036854775807</LIMIT>
+      <MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>74</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+    <OPCODE>OP_MODIFY_CACHE_POOL</OPCODE>
+    <DATA>
+      <TXID>67</TXID>
+      <POOLNAME>pool1</POOLNAME>
+      <LIMIT>99</LIMIT>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>75</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+    <OPCODE>OP_ADD_CACHE_DIRECTIVE</OPCODE>
+    <DATA>
+      <TXID>68</TXID>
+      <ID>1</ID>
+      <PATH>/path</PATH>
+      <REPLICATION>1</REPLICATION>
+      <POOL>pool1</POOL>
+      <EXPIRATION>2305844399041964876</EXPIRATION>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>76</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+    <OPCODE>OP_MODIFY_CACHE_DIRECTIVE</OPCODE>
+    <DATA>
+      <TXID>69</TXID>
+      <ID>1</ID>
+      <REPLICATION>2</REPLICATION>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>77</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+    <OPCODE>OP_REMOVE_CACHE_DIRECTIVE</OPCODE>
+    <DATA>
+      <TXID>70</TXID>
+      <ID>1</ID>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>78</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+    <OPCODE>OP_REMOVE_CACHE_POOL</OPCODE>
+    <DATA>
+      <TXID>71</TXID>
+      <POOLNAME>pool1</POOLNAME>
+      <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
+      <RPC_CALLID>79</RPC_CALLID>
+    </DATA>
+  </RECORD>
+  <RECORD>
+>>>>>>> .merge-right.r1559304
     <OPCODE>OP_END_LOG_SEGMENT</OPCODE>
     <DATA>
+<<<<<<< .working
       <TXID>76</TXID>
+=======
+      <TXID>72</TXID>
+>>>>>>> .merge-right.r1559304
     </DATA>
   </RECORD>
 </EDITS>



Mime
View raw message