big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-5309. Fix failing caching unit tests. (Andrew Wang)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1529646 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2013-10-06 17:06:03 +00:00
parent eb2175db1a
commit 633b693517
4 changed files with 86 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4949.txt
View File

@ -72,3 +72,5 @@ HDFS-4949 (Unreleased)
(Contributed by Andrew Wang)
HDFS-5266. ElasticByteBufferPool#Key does not implement equals. (cnauroth)
HDFS-5309. Fix failing caching unit tests. (Andrew Wang)

BIN
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored
View File

Binary file not shown.

156
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
View File

@ -13,8 +13,8 @@
<TXID>2</TXID>
<DELEGATION_KEY>
<KEY_ID>1</KEY_ID>
<EXPIRY_DATE>1381014414770</EXPIRY_DATE>
<KEY>0ed3ccccde5c0830</KEY>
<EXPIRY_DATE>1381693732152</EXPIRY_DATE>
<KEY>6a186e50c85a8650</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@ -24,8 +24,8 @@
<TXID>3</TXID>
<DELEGATION_KEY>
<KEY_ID>2</KEY_ID>
<EXPIRY_DATE>1381014414779</EXPIRY_DATE>
<KEY>1619312c238cd1b1</KEY>
<EXPIRY_DATE>1381693732162</EXPIRY_DATE>
<KEY>ae45ee278252aab6</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@ -37,18 +37,18 @@
<INODEID>16386</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323216882</MTIME>
<ATIME>1380323216882</ATIME>
<MTIME>1381002533488</MTIME>
<ATIME>1381002533488</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>7</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>9</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -59,8 +59,8 @@
<INODEID>0</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323216937</MTIME>
<ATIME>1380323216882</ATIME>
<MTIME>1381002533532</MTIME>
<ATIME>1381002533488</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>1380323216955</TIMESTAMP>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>9</RPC_CALLID>
<TIMESTAMP>1381002533550</TIMESTAMP>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>11</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -89,9 +89,9 @@
<TXID>7</TXID>
<LENGTH>0</LENGTH>
<PATH>/file_moved</PATH>
<TIMESTAMP>1380323216966</TIMESTAMP>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>10</RPC_CALLID>
<TIMESTAMP>1381002533572</TIMESTAMP>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>12</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -101,7 +101,7 @@
<LENGTH>0</LENGTH>
<INODEID>16387</INODEID>
<PATH>/directory_mkdir</PATH>
<TIMESTAMP>1380323216981</TIMESTAMP>
<TIMESTAMP>1381002533598</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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>15</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>17</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -147,8 +147,8 @@
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
<SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>16</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>18</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -157,8 +157,8 @@
<TXID>14</TXID>
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTNAME>snapshot2</SNAPSHOTNAME>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>17</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>19</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -169,18 +169,18 @@
<INODEID>16388</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217070</MTIME>
<ATIME>1380323217070</ATIME>
<MTIME>1381002533697</MTIME>
<ATIME>1381002533697</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>18</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>20</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -191,8 +191,8 @@
<INODEID>0</INODEID>
<PATH>/file_create_u\0001;F431</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217079</MTIME>
<ATIME>1380323217070</ATIME>
<MTIME>1381002533707</MTIME>
<ATIME>1381002533697</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>1380323217151</TIMESTAMP>
<TIMESTAMP>1381002533778</TIMESTAMP>
<OPTIONS>NONE</OPTIONS>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>25</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>27</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -267,18 +267,18 @@
<INODEID>16389</INODEID>
<PATH>/file_concat_target</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217170</MTIME>
<ATIME>1380323217170</ATIME>
<MTIME>1381002533795</MTIME>
<ATIME>1381002533795</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>27</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>29</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -388,8 +388,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_target</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217424</MTIME>
<ATIME>1380323217170</ATIME>
<MTIME>1381002534037</MTIME>
<ATIME>1381002533795</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>1380323217436</MTIME>
<ATIME>1380323217436</ATIME>
<MTIME>1381002534049</MTIME>
<ATIME>1381002534049</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>40</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>42</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -544,8 +544,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_0</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217529</MTIME>
<ATIME>1380323217436</ATIME>
<MTIME>1381002534137</MTIME>
<ATIME>1381002534049</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>1380323217542</MTIME>
<ATIME>1380323217542</ATIME>
<MTIME>1381002534149</MTIME>
<ATIME>1381002534149</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>52</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>54</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -700,8 +700,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_1</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217613</MTIME>
<ATIME>1380323217542</ATIME>
<MTIME>1381002534219</MTIME>
<ATIME>1381002534149</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>1380323217627</TIMESTAMP>
<TIMESTAMP>1381002534232</TIMESTAMP>
<SOURCES>
<SOURCE1>/file_concat_0</SOURCE1>
<SOURCE2>/file_concat_1</SOURCE2>
</SOURCES>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>63</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>65</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -750,15 +750,15 @@
<INODEID>16392</INODEID>
<PATH>/file_symlink</PATH>
<VALUE>/file_concat_target</VALUE>
<MTIME>1380323217643</MTIME>
<ATIME>1380323217643</ATIME>
<MTIME>1381002534247</MTIME>
<ATIME>1381002534247</ATIME>
<PERMISSION_STATUS>
<USERNAME>andrew</USERNAME>
<GROUPNAME>supergroup</GROUPNAME>
<MODE>511</MODE>
</PERMISSION_STATUS>
<RPC_CLIENTID>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>64</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>66</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -771,11 +771,11 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1380323217655</ISSUE_DATE>
<MAX_DATE>1380928017655</MAX_DATE>
<ISSUE_DATE>1381002534260</ISSUE_DATE>
<MAX_DATE>1381607334260</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
<EXPIRY_TIME>1380409617655</EXPIRY_TIME>
<EXPIRY_TIME>1381088934260</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
@ -788,11 +788,11 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1380323217655</ISSUE_DATE>
<MAX_DATE>1380928017655</MAX_DATE>
<ISSUE_DATE>1381002534260</ISSUE_DATE>
<MAX_DATE>1381607334260</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
<EXPIRY_TIME>1380409617701</EXPIRY_TIME>
<EXPIRY_TIME>1381088934303</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
@ -805,8 +805,8 @@
<OWNER>andrew</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1380323217655</ISSUE_DATE>
<MAX_DATE>1380928017655</MAX_DATE>
<ISSUE_DATE>1381002534260</ISSUE_DATE>
<MAX_DATE>1381607334260</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
</DATA>
@ -865,18 +865,18 @@
<INODEID>16393</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323217822</MTIME>
<ATIME>1380323217822</ATIME>
<MTIME>1381002534420</MTIME>
<ATIME>1381002534420</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_1160098410_1</CLIENT_NAME>
<CLIENT_NAME>DFSClient_NONMAPREDUCE_2001868554_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>ff07f00d-efa9-4b76-a064-63604cd3286e</RPC_CLIENTID>
<RPC_CALLID>73</RPC_CALLID>
<RPC_CLIENTID>8e519582-234f-415a-85b8-2f3d616eb06f</RPC_CLIENTID>
<RPC_CALLID>75</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -932,7 +932,7 @@
<OPCODE>OP_REASSIGN_LEASE</OPCODE>
<DATA>
<TXID>72</TXID>
<LEASEHOLDER>DFSClient_NONMAPREDUCE_1160098410_1</LEASEHOLDER>
<LEASEHOLDER>DFSClient_NONMAPREDUCE_2001868554_1</LEASEHOLDER>
<PATH>/hard-lease-recovery-test</PATH>
<NEWHOLDER>HDFS_NameNode</NEWHOLDER>
</DATA>
@ -961,8 +961,8 @@
<INODEID>0</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
<MTIME>1380323222701</MTIME>
<ATIME>1380323217822</ATIME>
<MTIME>1381002539323</MTIME>
<ATIME>1381002534420</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>

12
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml
View File

@ -165,9 +165,9 @@
<description>Testing creating cache paths</description>
<test-commands>
<cache-admin-command>-addPool pool1</cache-admin-command>
<cache-admin-command>-addPath -path /foo -pool pool1</cache-admin-command>
<cache-admin-command>-addPath -path /bar -pool pool1</cache-admin-command>
<cache-admin-command>-listPaths -pool 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>-listDirectives -pool pool1</cache-admin-command>
</test-commands>
<cleanup-commands>
<cache-admin-command>-removePool pool1</cache-admin-command>
@ -192,10 +192,10 @@
<description>Testing removing cache paths</description>
<test-commands>
<cache-admin-command>-addPool pool1</cache-admin-command>
<cache-admin-command>-addPath -path /foo -pool pool1</cache-admin-command>
<cache-admin-command>-addPath -path /bar -pool 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>-removePool pool1</cache-admin-command>
<cache-admin-command>-listPaths -pool pool1</cache-admin-command>
<cache-admin-command>-listDirectives -pool pool1</cache-admin-command>
</test-commands>
<cleanup-commands>
</cleanup-commands>