You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by wa...@apache.org on 2013/11/28 08:20:22 UTC
svn commit: r1546301 [2/2] - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: ./
src/main/java/org/apache/hadoop/hdfs/
src/main/java/org/apache/hadoop/hdfs/protocol/
src/main/java/org/apache/hadoop/hdfs/protocolPB/
src/main/java/org/apache/hado...
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml?rev=1546301&r1=1546300&r2=1546301&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml Thu Nov 28 07:20:21 2013
@@ -13,8 +13,8 @@
<TXID>2</TXID>
<DELEGATION_KEY>
<KEY_ID>1</KEY_ID>
- <EXPIRY_DATE>1381946377599</EXPIRY_DATE>
- <KEY>4f37c0db7342fb35</KEY>
+ <EXPIRY_DATE>1386314182272</EXPIRY_DATE>
+ <KEY>39c9f9e9c1e88712</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@@ -24,8 +24,8 @@
<TXID>3</TXID>
<DELEGATION_KEY>
<KEY_ID>2</KEY_ID>
- <EXPIRY_DATE>1381946377609</EXPIRY_DATE>
- <KEY>471d4ddd00402ba6</KEY>
+ <EXPIRY_DATE>1386314182280</EXPIRY_DATE>
+ <KEY>2b35e969a178a2f6</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@@ -37,18 +37,18 @@
<INODEID>16386</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179312</MTIME>
- <ATIME>1381255179312</ATIME>
+ <MTIME>1385622983286</MTIME>
+ <ATIME>1385622983286</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>8</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>6</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -59,8 +59,8 @@
<INODEID>0</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179355</MTIME>
- <ATIME>1381255179312</ATIME>
+ <MTIME>1385622983323</MTIME>
+ <ATIME>1385622983286</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@@ -78,9 +78,9 @@
<LENGTH>0</LENGTH>
<SRC>/file_create_u\0001;F431</SRC>
<DST>/file_moved</DST>
- <TIMESTAMP>1381255179373</TIMESTAMP>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>10</RPC_CALLID>
+ <TIMESTAMP>1385622983331</TIMESTAMP>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</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>1381255179397</TIMESTAMP>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>11</RPC_CALLID>
+ <TIMESTAMP>1385622983340</TIMESTAMP>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>9</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -101,7 +101,7 @@
<LENGTH>0</LENGTH>
<INODEID>16387</INODEID>
<PATH>/directory_mkdir</PATH>
- <TIMESTAMP>1381255179424</TIMESTAMP>
+ <TIMESTAMP>1385622983351</TIMESTAMP>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
@@ -136,8 +136,8 @@
<TXID>12</TXID>
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTNAME>snapshot1</SNAPSHOTNAME>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>16</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</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>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>17</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</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>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>18</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>16</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -169,18 +169,18 @@
<INODEID>16388</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179522</MTIME>
- <ATIME>1381255179522</ATIME>
+ <MTIME>1385622983397</MTIME>
+ <ATIME>1385622983397</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>19</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>17</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -191,8 +191,8 @@
<INODEID>0</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179531</MTIME>
- <ATIME>1381255179522</ATIME>
+ <MTIME>1385622983402</MTIME>
+ <ATIME>1385622983397</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@@ -253,10 +253,10 @@
<LENGTH>0</LENGTH>
<SRC>/file_create_u\0001;F431</SRC>
<DST>/file_moved</DST>
- <TIMESTAMP>1381255179602</TIMESTAMP>
+ <TIMESTAMP>1385622983438</TIMESTAMP>
<OPTIONS>NONE</OPTIONS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>26</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</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>1381255179619</MTIME>
- <ATIME>1381255179619</ATIME>
+ <MTIME>1385622983445</MTIME>
+ <ATIME>1385622983445</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>28</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>26</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -388,8 +388,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_target</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179862</MTIME>
- <ATIME>1381255179619</ATIME>
+ <MTIME>1385622983524</MTIME>
+ <ATIME>1385622983445</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@@ -423,18 +423,18 @@
<INODEID>16390</INODEID>
<PATH>/file_concat_0</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179876</MTIME>
- <ATIME>1381255179876</ATIME>
+ <MTIME>1385622983530</MTIME>
+ <ATIME>1385622983530</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>41</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>39</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -544,8 +544,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_0</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179957</MTIME>
- <ATIME>1381255179876</ATIME>
+ <MTIME>1385622983582</MTIME>
+ <ATIME>1385622983530</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@@ -579,18 +579,18 @@
<INODEID>16391</INODEID>
<PATH>/file_concat_1</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255179967</MTIME>
- <ATIME>1381255179967</ATIME>
+ <MTIME>1385622983593</MTIME>
+ <ATIME>1385622983593</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>53</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>51</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -700,8 +700,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_1</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255180085</MTIME>
- <ATIME>1381255179967</ATIME>
+ <MTIME>1385622983655</MTIME>
+ <ATIME>1385622983593</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@@ -733,13 +733,13 @@
<TXID>56</TXID>
<LENGTH>0</LENGTH>
<TRG>/file_concat_target</TRG>
- <TIMESTAMP>1381255180099</TIMESTAMP>
+ <TIMESTAMP>1385622983667</TIMESTAMP>
<SOURCES>
<SOURCE1>/file_concat_0</SOURCE1>
<SOURCE2>/file_concat_1</SOURCE2>
</SOURCES>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>64</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>62</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -750,15 +750,15 @@
<INODEID>16392</INODEID>
<PATH>/file_symlink</PATH>
<VALUE>/file_concat_target</VALUE>
- <MTIME>1381255180116</MTIME>
- <ATIME>1381255180116</ATIME>
+ <MTIME>1385622983683</MTIME>
+ <ATIME>1385622983683</ATIME>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>511</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>65</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>63</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -771,11 +771,11 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
- <ISSUE_DATE>1381255180128</ISSUE_DATE>
- <MAX_DATE>1381859980128</MAX_DATE>
+ <ISSUE_DATE>1385622983698</ISSUE_DATE>
+ <MAX_DATE>1386227783698</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
- <EXPIRY_TIME>1381341580128</EXPIRY_TIME>
+ <EXPIRY_TIME>1385709383698</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
@@ -788,11 +788,11 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
- <ISSUE_DATE>1381255180128</ISSUE_DATE>
- <MAX_DATE>1381859980128</MAX_DATE>
+ <ISSUE_DATE>1385622983698</ISSUE_DATE>
+ <MAX_DATE>1386227783698</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
- <EXPIRY_TIME>1381341580177</EXPIRY_TIME>
+ <EXPIRY_TIME>1385709383746</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
@@ -805,8 +805,8 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
- <ISSUE_DATE>1381255180128</ISSUE_DATE>
- <MAX_DATE>1381859980128</MAX_DATE>
+ <ISSUE_DATE>1385622983698</ISSUE_DATE>
+ <MAX_DATE>1386227783698</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
</DATA>
@@ -822,8 +822,8 @@
<MODE>493</MODE>
</PERMISSION_STATUS>
<WEIGHT>100</WEIGHT>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>75</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>67</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -835,39 +835,40 @@
<GROUPNAME>party</GROUPNAME>
<MODE>448</MODE>
<WEIGHT>1989</WEIGHT>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>76</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>68</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
- <OPCODE>OP_ADD_PATH_BASED_CACHE_DIRECTIVE</OPCODE>
+ <OPCODE>OP_ADD_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>63</TXID>
<ID>1</ID>
<PATH>/bar</PATH>
<REPLICATION>1</REPLICATION>
<POOL>poolparty</POOL>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>77</RPC_CALLID>
+ <EXPIRATION>-1</EXPIRATION>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>69</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
- <OPCODE>OP_MODIFY_PATH_BASED_CACHE_DIRECTIVE</OPCODE>
+ <OPCODE>OP_MODIFY_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>64</TXID>
<ID>1</ID>
- <REPLICATION>2</REPLICATION>
- <RPC_CLIENTID></RPC_CLIENTID>
- <RPC_CALLID>-2</RPC_CALLID>
+ <PATH>/bar2</PATH>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>70</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
- <OPCODE>OP_REMOVE_PATH_BASED_CACHE_DIRECTIVE</OPCODE>
+ <OPCODE>OP_REMOVE_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>65</TXID>
<ID>1</ID>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>78</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>71</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -875,8 +876,8 @@
<DATA>
<TXID>66</TXID>
<POOLNAME>poolparty</POOLNAME>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>79</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>72</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -887,18 +888,18 @@
<INODEID>16393</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255180288</MTIME>
- <ATIME>1381255180288</ATIME>
+ <MTIME>1385622983896</MTIME>
+ <ATIME>1385622983896</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
- <CLIENT_NAME>DFSClient_NONMAPREDUCE_-134124999_1</CLIENT_NAME>
+ <CLIENT_NAME>DFSClient_NONMAPREDUCE_-1208536327_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
- <RPC_CLIENTID>27ac79f0-d378-4933-824b-c2a188968d97</RPC_CLIENTID>
- <RPC_CALLID>74</RPC_CALLID>
+ <RPC_CLIENTID>26a8071a-18f8-42ce-ad7e-75692493e45c</RPC_CLIENTID>
+ <RPC_CALLID>73</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@@ -936,7 +937,7 @@
<PATH>/hard-lease-recovery-test</PATH>
<BLOCK>
<BLOCK_ID>1073741834</BLOCK_ID>
- <NUM_BYTES>0</NUM_BYTES>
+ <NUM_BYTES>11</NUM_BYTES>
<GENSTAMP>1010</GENSTAMP>
</BLOCK>
<RPC_CLIENTID></RPC_CLIENTID>
@@ -954,23 +955,7 @@
<OPCODE>OP_REASSIGN_LEASE</OPCODE>
<DATA>
<TXID>73</TXID>
- <LEASEHOLDER>DFSClient_NONMAPREDUCE_-134124999_1</LEASEHOLDER>
- <PATH>/hard-lease-recovery-test</PATH>
- <NEWHOLDER>HDFS_NameNode</NEWHOLDER>
- </DATA>
- </RECORD>
- <RECORD>
- <OPCODE>OP_SET_GENSTAMP_V2</OPCODE>
- <DATA>
- <TXID>74</TXID>
- <GENSTAMPV2>1012</GENSTAMPV2>
- </DATA>
- </RECORD>
- <RECORD>
- <OPCODE>OP_REASSIGN_LEASE</OPCODE>
- <DATA>
- <TXID>75</TXID>
- <LEASEHOLDER>HDFS_NameNode</LEASEHOLDER>
+ <LEASEHOLDER>DFSClient_NONMAPREDUCE_-1208536327_1</LEASEHOLDER>
<PATH>/hard-lease-recovery-test</PATH>
<NEWHOLDER>HDFS_NameNode</NEWHOLDER>
</DATA>
@@ -978,20 +963,20 @@
<RECORD>
<OPCODE>OP_CLOSE</OPCODE>
<DATA>
- <TXID>76</TXID>
+ <TXID>74</TXID>
<LENGTH>0</LENGTH>
<INODEID>0</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
- <MTIME>1381255185142</MTIME>
- <ATIME>1381255180288</ATIME>
+ <MTIME>1385622986265</MTIME>
+ <ATIME>1385622983896</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
<BLOCK>
<BLOCK_ID>1073741834</BLOCK_ID>
<NUM_BYTES>11</NUM_BYTES>
- <GENSTAMP>1012</GENSTAMP>
+ <GENSTAMP>1011</GENSTAMP>
</BLOCK>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
@@ -1003,7 +988,7 @@
<RECORD>
<OPCODE>OP_END_LOG_SEGMENT</OPCODE>
<DATA>
- <TXID>77</TXID>
+ <TXID>75</TXID>
</DATA>
</RECORD>
</EDITS>
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml?rev=1546301&r1=1546300&r2=1546301&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml Thu Nov 28 07:20:21 2013
@@ -165,9 +165,9 @@
<description>Testing creating cache paths</description>
<test-commands>
<cache-admin-command>-addPool pool1</cache-admin-command>
- <cache-admin-command>-addDirective -path /foo -pool pool1</cache-admin-command>
- <cache-admin-command>-addDirective -path /bar -pool pool1</cache-admin-command>
- <cache-admin-command>-addDirective -path /baz -replication 2 -pool pool1</cache-admin-command>
+ <cache-admin-command>-addDirective -path /foo -pool pool1 -ttl 2d</cache-admin-command>
+ <cache-admin-command>-addDirective -path /bar -pool pool1 -ttl 24h</cache-admin-command>
+ <cache-admin-command>-addDirective -path /baz -replication 2 -pool pool1 -ttl 60m</cache-admin-command>
<cache-admin-command>-listDirectives -pool pool1</cache-admin-command>
</test-commands>
<cleanup-commands>
@@ -180,15 +180,15 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 1 pool1 1 /foo</expected-output>
+ <expected-output> 1 pool1 1</expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 2 pool1 1 /bar</expected-output>
+ <expected-output> 2 pool1 1</expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 3 pool1 2 /baz</expected-output>
+ <expected-output> 3 pool1 2 </expected-output>
</comparator>
</comparators>
</test>
@@ -234,11 +234,11 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 8 pool2 1 /baz</expected-output>
+ <expected-output> 8 pool2 1 never /baz </expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 9 pool2 1 /buz</expected-output>
+ <expected-output> 9 pool2 1 never /buz </expected-output>
</comparator>
</comparators>
</test>
@@ -265,11 +265,11 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 10 pool1 1 /foo</expected-output>
+ <expected-output> 10 pool1 1 never /foo </expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 12 pool2 1 /foo</expected-output>
+ <expected-output> 12 pool2 1 never /foo </expected-output>
</comparator>
</comparators>
</test>
@@ -296,7 +296,7 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 16 pool2 1 /foo</expected-output>
+ <expected-output> 16 pool2 1 never /foo </expected-output>
</comparator>
</comparators>
</test>
@@ -320,7 +320,7 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 19 pool1 1 /bar</expected-output>
+ <expected-output> 19 pool1 1 never /bar </expected-output>
</comparator>
</comparators>
</test>
@@ -349,11 +349,11 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 22 pool1 1 /bar</expected-output>
+ <expected-output> 22 pool1 1 never /bar </expected-output>
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 24 pool2 1 /bar</expected-output>
+ <expected-output> 24 pool2 1 never /bar </expected-output>
</comparator>
</comparators>
</test>
@@ -379,7 +379,7 @@
</comparator>
<comparator>
<type>SubstringComparator</type>
- <expected-output> 25 pool1 1 /bar3</expected-output>
+ <expected-output> 25 pool1 1 never /bar3 </expected-output>
</comparator>
</comparators>
</test>