Modified: hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml?rev=1619012&r1=1619011&r2=1619012&view=diff ============================================================================== --- hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml (original) +++ hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml Tue Aug 19 23:49:39 2014 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <EDITS> - <EDITS_VERSION>-56</EDITS_VERSION> + <EDITS_VERSION>-57</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>1394849922137</EXPIRY_DATE> - <KEY>37e1a64049bbef35</KEY> + <EXPIRY_DATE>1403590428625</EXPIRY_DATE> + <KEY>16f34bfba67b2552</KEY> </DELEGATION_KEY> </DATA> </RECORD> @@ -24,8 +24,8 @@ <TXID>3</TXID> <DELEGATION_KEY> <KEY_ID>2</KEY_ID> - <EXPIRY_DATE>1394849922140</EXPIRY_DATE> - <KEY>7c0bf5039242fc54</KEY> + <EXPIRY_DATE>1403590428631</EXPIRY_DATE> + <KEY>dbe6282854469833</KEY> </DELEGATION_KEY> </DATA> </RECORD> @@ -37,18 +37,18 @@ <INODEID>16386</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722811</MTIME> - <ATIME>1394158722811</ATIME> + <MTIME>1402899229669</MTIME> + <ATIME>1402899229669</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>6</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>8</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -59,13 +59,13 @@ <INODEID>0</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722832</MTIME> - <ATIME>1394158722811</ATIME> + <MTIME>1402899229711</MTIME> + <ATIME>1402899229669</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>1394158722836</TIMESTAMP> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>8</RPC_CALLID> + <TIMESTAMP>1402899229718</TIMESTAMP> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>10</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -89,9 +89,9 @@ <TXID>7</TXID> <LENGTH>0</LENGTH> <PATH>/file_moved</PATH> - <TIMESTAMP>1394158722842</TIMESTAMP> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>9</RPC_CALLID> + <TIMESTAMP>1402899229730</TIMESTAMP> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>11</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -101,9 +101,9 @@ <LENGTH>0</LENGTH> <INODEID>16387</INODEID> <PATH>/directory_mkdir</PATH> - <TIMESTAMP>1394158722848</TIMESTAMP> + <TIMESTAMP>1402899229748</TIMESTAMP> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>14</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>16</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -147,8 +147,8 @@ <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT> <SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME> <SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>15</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>17</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -157,8 +157,8 @@ <TXID>14</TXID> <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT> <SNAPSHOTNAME>snapshot2</SNAPSHOTNAME> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>16</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>18</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -169,18 +169,18 @@ <INODEID>16388</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722872</MTIME> - <ATIME>1394158722872</ATIME> + <MTIME>1402899229871</MTIME> + <ATIME>1402899229871</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>17</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>19</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -191,13 +191,13 @@ <INODEID>0</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722874</MTIME> - <ATIME>1394158722872</ATIME> + <MTIME>1402899229881</MTIME> + <ATIME>1402899229871</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>1394158722890</TIMESTAMP> + <TIMESTAMP>1402899229963</TIMESTAMP> <OPTIONS>NONE</OPTIONS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>24</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>26</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -267,18 +267,18 @@ <INODEID>16389</INODEID> <PATH>/file_concat_target</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722895</MTIME> - <ATIME>1394158722895</ATIME> + <MTIME>1402899229981</MTIME> + <ATIME>1402899229981</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>26</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>28</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -383,8 +383,8 @@ <INODEID>0</INODEID> <PATH>/file_concat_target</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158722986</MTIME> - <ATIME>1394158722895</ATIME> + <MTIME>1402899230219</MTIME> + <ATIME>1402899229981</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -404,7 +404,7 @@ <GENSTAMP>1003</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>1394158722989</MTIME> - <ATIME>1394158722989</ATIME> + <MTIME>1402899230235</MTIME> + <ATIME>1402899230235</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>39</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>41</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -534,8 +534,8 @@ <INODEID>0</INODEID> <PATH>/file_concat_0</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158723010</MTIME> - <ATIME>1394158722989</ATIME> + <MTIME>1402899230307</MTIME> + <ATIME>1402899230235</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -555,7 +555,7 @@ <GENSTAMP>1006</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>1394158723012</MTIME> - <ATIME>1394158723012</ATIME> + <MTIME>1402899230320</MTIME> + <ATIME>1402899230320</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>51</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>53</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -685,8 +685,8 @@ <INODEID>0</INODEID> <PATH>/file_concat_1</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158723035</MTIME> - <ATIME>1394158723012</ATIME> + <MTIME>1402899230383</MTIME> + <ATIME>1402899230320</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -706,7 +706,7 @@ <GENSTAMP>1009</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</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>1394158723039</TIMESTAMP> + <TIMESTAMP>1402899230394</TIMESTAMP> <SOURCES> <SOURCE1>/file_concat_0</SOURCE1> <SOURCE2>/file_concat_1</SOURCE2> </SOURCES> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>62</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>64</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -735,15 +735,15 @@ <INODEID>16392</INODEID> <PATH>/file_symlink</PATH> <VALUE>/file_concat_target</VALUE> - <MTIME>1394158723044</MTIME> - <ATIME>1394158723044</ATIME> + <MTIME>1402899230406</MTIME> + <ATIME>1402899230406</ATIME> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>511</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>63</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>65</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -754,18 +754,18 @@ <INODEID>16393</INODEID> <PATH>/hard-lease-recovery-test</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1394158723047</MTIME> - <ATIME>1394158723047</ATIME> + <MTIME>1402899230413</MTIME> + <ATIME>1402899230413</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_221786725_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>64</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>66</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -821,7 +821,7 @@ <OPCODE>OP_REASSIGN_LEASE</OPCODE> <DATA> <TXID>64</TXID> - <LEASEHOLDER>DFSClient_NONMAPREDUCE_221786725_1</LEASEHOLDER> + <LEASEHOLDER>DFSClient_NONMAPREDUCE_1233039831_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>1394158725708</MTIME> - <ATIME>1394158723047</ATIME> + <MTIME>1402899232526</MTIME> + <ATIME>1402899230413</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -845,7 +845,7 @@ <GENSTAMP>1011</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>jing</USERNAME> + <USERNAME>andrew</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> @@ -856,13 +856,13 @@ <DATA> <TXID>66</TXID> <POOLNAME>pool1</POOLNAME> - <OWNERNAME>jing</OWNERNAME> - <GROUPNAME>staff</GROUPNAME> + <OWNERNAME>andrew</OWNERNAME> + <GROUPNAME>andrew</GROUPNAME> <MODE>493</MODE> <LIMIT>9223372036854775807</LIMIT> <MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>71</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>73</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -871,8 +871,8 @@ <TXID>67</TXID> <POOLNAME>pool1</POOLNAME> <LIMIT>99</LIMIT> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>72</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>74</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -883,9 +883,9 @@ <PATH>/path</PATH> <REPLICATION>1</REPLICATION> <POOL>pool1</POOL> - <EXPIRATION>2305844403372420029</EXPIRATION> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>73</RPC_CALLID> + <EXPIRATION>2305844412112927450</EXPIRATION> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>75</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -894,8 +894,8 @@ <TXID>69</TXID> <ID>1</ID> <REPLICATION>2</REPLICATION> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>74</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>76</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -903,8 +903,8 @@ <DATA> <TXID>70</TXID> <ID>1</ID> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>75</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>77</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -912,8 +912,8 @@ <DATA> <TXID>71</TXID> <POOLNAME>pool1</POOLNAME> - <RPC_CLIENTID>9b85a845-bbfa-42f6-8a16-c433614b8eb9</RPC_CLIENTID> - <RPC_CALLID>76</RPC_CALLID> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>78</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -921,26 +921,93 @@ <DATA> <TXID>72</TXID> <SRC>/file_concat_target</SRC> + <ENTRY> + <SCOPE>ACCESS</SCOPE> + <TYPE>USER</TYPE> + <PERM>rw-</PERM> + </ENTRY> + <ENTRY> + <SCOPE>ACCESS</SCOPE> + <TYPE>USER</TYPE> + <NAME>user</NAME> + <PERM>rw-</PERM> + </ENTRY> + <ENTRY> + <SCOPE>ACCESS</SCOPE> + <TYPE>GROUP</TYPE> + <PERM>-w-</PERM> + </ENTRY> + <ENTRY> + <SCOPE>ACCESS</SCOPE> + <TYPE>MASK</TYPE> + <PERM>rw-</PERM> + </ENTRY> + <ENTRY> + <SCOPE>ACCESS</SCOPE> + <TYPE>OTHER</TYPE> + <PERM>---</PERM> + </ENTRY> </DATA> </RECORD> <RECORD> - <OPCODE>OP_ROLLING_UPGRADE_START</OPCODE> + <OPCODE>OP_SET_XATTR</OPCODE> <DATA> <TXID>73</TXID> - <STARTTIME>1394158726098</STARTTIME> + <SRC>/file_concat_target</SRC> + <XATTR> + <NAMESPACE>USER</NAMESPACE> + <NAME>a1</NAME> + <VALUE>0x313233</VALUE> + </XATTR> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>80</RPC_CALLID> </DATA> </RECORD> <RECORD> - <OPCODE>OP_ROLLING_UPGRADE_FINALIZE</OPCODE> + <OPCODE>OP_SET_XATTR</OPCODE> <DATA> <TXID>74</TXID> - <FINALIZETIME>1394158726098</FINALIZETIME> + <SRC>/file_concat_target</SRC> + <XATTR> + <NAMESPACE>USER</NAMESPACE> + <NAME>a2</NAME> + <VALUE>0x373839</VALUE> + </XATTR> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>81</RPC_CALLID> </DATA> </RECORD> <RECORD> - <OPCODE>OP_END_LOG_SEGMENT</OPCODE> + <OPCODE>OP_REMOVE_XATTR</OPCODE> <DATA> <TXID>75</TXID> + <SRC>/file_concat_target</SRC> + <XATTR> + <NAMESPACE>USER</NAMESPACE> + <NAME>a2</NAME> + </XATTR> + <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID> + <RPC_CALLID>82</RPC_CALLID> + </DATA> + </RECORD> + <RECORD> + <OPCODE>OP_ROLLING_UPGRADE_START</OPCODE> + <DATA> + <TXID>76</TXID> + <STARTTIME>1402899233646</STARTTIME> + </DATA> + </RECORD> + <RECORD> + <OPCODE>OP_ROLLING_UPGRADE_FINALIZE</OPCODE> + <DATA> + <TXID>77</TXID> + <FINALIZETIME>1402899233647</FINALIZETIME> + </DATA> + </RECORD> + <RECORD> + <OPCODE>OP_END_LOG_SEGMENT</OPCODE> + <DATA> + <TXID>78</TXID> </DATA> </RECORD> </EDITS>
Modified: hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?rev=1619012&r1=1619011&r2=1619012&view=diff ============================================================================== --- hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml (original) +++ hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml Tue Aug 19 23:49:39 2014 @@ -903,7 +903,7 @@ <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^drwxr-xr-x\+( )*-( )*[a-zA-z0-9]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/dir1/dir2</expected-output> + <expected-output>^drwxr-xr-x\+( )*-( )*USERNAME( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/dir1/dir2</expected-output> </comparator> </comparators> </test> Modified: hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml?rev=1619012&r1=1619011&r2=1619012&view=diff ============================================================================== --- hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml (original) +++ hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testCacheAdminConf.xml Tue Aug 19 23:49:39 2014 @@ -519,5 +519,29 @@ </comparator> </comparators> </test> + + <test> <!--Tested --> + <description>Testing listing a single cache directive</description> + <test-commands> + <cache-admin-command>-addPool 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 -stats -id 30</cache-admin-command> + </test-commands> + <cleanup-commands> + <cache-admin-command>-removePool pool1</cache-admin-command> + </cleanup-commands> + <comparators> + <comparator> + <type>SubstringComparator</type> + <expected-output>Found 1 entry</expected-output> + </comparator> + <comparator> + <type>SubstringComparator</type> + <expected-output>30 pool1 1</expected-output> + </comparator> + </comparators> + </test> </tests> </configuration> Modified: hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1619012&r1=1619011&r2=1619012&view=diff ============================================================================== --- hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml (original) +++ hadoop/common/branches/HADOOP-10388/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml Tue Aug 19 23:49:39 2014 @@ -8655,6 +8655,50 @@ </comparators> </test> + <test> <!-- TESTED --> + <description>count: file using -h option</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p dir</command> <!-- make sure user home dir exists --> + <command>-fs NAMENODE -put CLITEST_DATA/data15bytes file1</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k file2</command> + <command>-fs NAMENODE -count -h file1 file2</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm file1 file2</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>( |\t)*0( |\t)*1( |\t)*15 file1</expected-output> + </comparator> + </comparators> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>( |\t)*0( |\t)*1( |\t)*1\.0 K file2</expected-output> + </comparator> + </comparators> + </test> + + <test> <!-- TESTED --> + <description>count: directory using -q and -h options</description> + <test-commands> + <command>-fs NAMENODE -mkdir /dir1</command> + <dfs-admin-command>-fs NAMENODE -setQuota 10 /dir1 </dfs-admin-command> + <dfs-admin-command>-fs NAMENODE -setSpaceQuota 1m /dir1 </dfs-admin-command> + <command>-fs NAMENODE -count -q -h /dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>( |\t)*10( |\t)*9( |\t)*1 M( |\t)*1 M( |\t)*1( |\t)*0( |\t)*0 /dir1</expected-output> + </comparator> + </comparators> + </test> + <!-- Tests for chmod --> <test> <!-- TESTED --> <description>chmod: change permission(octal mode) of file in absolute path</description> @@ -15220,7 +15264,11 @@ <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^-report:( |\t)*Reports basic filesystem information and statistics.( )*</expected-output> + <expected-output>^-report \[-live\] \[-dead\] \[-decommissioning\]:(.)*</expected-output> + </comparator> + <comparator> + <type>RegexpComparator</type> + <expected-output>^[ \t]*Reports basic filesystem information and statistics.( )*</expected-output> </comparator> </comparators> </test> @@ -15710,8 +15758,8 @@ </cleanup-commands> <comparators> <comparator> - <type>ExactComparator</type> - <expected-output></expected-output> + <type>RegexpComparator</type> + <expected-output>Refresh service acl successful(\n)*</expected-output> </comparator> </comparators> </test><!-- @@ -15900,9 +15948,9 @@ <type>RegexpComparator</type> <expected-output>DFS Used\%: [0-9\.]+%</expected-output> </comparator> - <comparator> + <comparator> <type>RegexpComparator</type> - <expected-output>Datanodes available: [0-9]+ \([0-9]+ total, [0-9]+ dead\)</expected-output> + <expected-output>Live datanodes \([0-9]+\):</expected-output> </comparator> <comparator> <type>RegexpComparator</type> @@ -15930,7 +15978,7 @@ </comparator> <comparator> <type>TokenComparator</type> - <expected-output>Live datanodes:</expected-output> + <expected-output>Live datanodes</expected-output> </comparator> </comparators> </test> @@ -15947,8 +15995,8 @@ </cleanup-commands> <comparators> <comparator> - <type>ExactComparator</type> - <expected-output></expected-output> + <type>RegexpComparator</type> + <expected-output>Save namespace successful(\n)*</expected-output> </comparator> </comparators> </test> @@ -16020,10 +16068,6 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>Datanodes available: [0-9]+ \([0-9]+ total, [0-9]+ dead\)</expected-output> - </comparator> - <comparator> - <type>RegexpComparator</type> <expected-output>Name: [0-9\.:]+ \([-.a-zA-z0-9\.]+\)</expected-output> </comparator> <comparator> @@ -16048,7 +16092,7 @@ </comparator> <comparator> <type>TokenComparator</type> - <expected-output>Live datanodes:</expected-output> + <expected-output>Live datanodes</expected-output> </comparator> </comparators> </test> @@ -16118,14 +16162,372 @@ </comparators> </test> + <!-- DFS tests --> + <test> + <description>appendToFile</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -touchz /user/USERNAME/dir1/file0</command> + <command>-fs NAMENODE -appendToFile CLITEST_DATA/data15bytes /user/USERNAME/dir1/file0</command> + <command>-fs NAMENODE -cat /user/USERNAME/dir1/file0</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>12345678901234</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>text</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /user/USERNAME/dir1/file0</command> + <command>-fs NAMENODE -text /user/USERNAME/dir1/file0</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>12345678901234</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>rmdir</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -rmdir /user/USERNAME/dir1</command> + <command>-fs NAMENODE -ls /user/USERNAME/</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output></expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>rmdir with ignore-fail-on-non-empty</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /user/USERNAME/dir1/file0</command> + <command>-fs NAMENODE -rmdir --ignore-fail-on-non-empty /user/USERNAME/dir1</command> + <command>-fs NAMENODE -ls /user/USERNAME/</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Found 1 items</expected-output> + </comparator> + <comparator> + <type>RegexpComparator</type> + <expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/user/USERNAME/dir1</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>df</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /user/USERNAME/dir1/file0</command> + <command>-fs NAMENODE -df /user/USERNAME</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Filesystem( )*Size( )*Used( )*Available( )*Use%.*</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>expunge</description> + <test-commands> + <command>-fs NAMENODE -expunge</command> + </test-commands> + <cleanup-commands> + <command></command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output></expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>getmerge</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes /user/USERNAME/dir1</command> + <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data30bytes /user/USERNAME/dir1</command> + <command>-fs NAMENODE -getmerge /user/USERNAME/dir1 data</command> + <command>-cat data</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>rm data</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>12345678901234.*</expected-output> + </comparator> + </comparators> + </test> + + <!-- Tests for snapshots --> + <test> + <description>allowSnapshot</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -allowSnapshot /user/USERNAME/dir1</dfs-admin-command> + </test-commands> + <cleanup-commands> + <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Allowing snaphot on /user/USERNAME/dir1 succeeded</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>disallowSnapshot</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -allowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Disallowing snaphot on /user/USERNAME/dir1 succeeded</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>createSnapshot</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -allowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1 snapshot1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1 snapshot1</command> + <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Created snapshot /user/USERNAME/dir1/.snapshot/snapshot1</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>renameSnapshot</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -allowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1 snapshot1</command> + <command>-fs NAMENODE -renameSnapshot /user/USERNAME/dir1 snapshot1 snapshot2</command> + <command>-fs NAMENODE -ls /user/USERNAME/dir1/.snapshot</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1 snapshot2</command> + <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Found 1 items</expected-output> + </comparator> + <comparator> + <type>RegexpComparator</type> + <expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/user/USERNAME/dir1/.snapshot/snapshot2</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>deleteSnapshot</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -allowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1 snapshot1</command> + <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1 snapshot1</command> + <command>-fs NAMENODE -ls /user/USERNAME/dir1/.snapshot</command> + </test-commands> + <cleanup-commands> + <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output></expected-output> + </comparator> + </comparators> + </test> + + <!-- DFSadmin tests --> + <test> + <description>refreshUserToGroupsMappings</description> + <test-commands> + <dfs-admin-command>-fs NAMENODE -refreshUserToGroupsMappings</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command></command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Refresh user to groups mapping successful(\n)*</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>refreshSuperUserGroupsConfiguration</description> + <test-commands> + <dfs-admin-command>-fs NAMENODE -refreshSuperUserGroupsConfiguration</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command></command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Refresh super user groups configuration successful(\n)*</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>setQuota</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -setQuota 3 /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>( )*3.*/user/USERNAME/dir1</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>clrQuota</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -setQuota 3 /user/USERNAME/dir1</dfs-admin-command> + <dfs-admin-command>-fs NAMENODE -clrQuota /user/USERNAME/dir1</dfs-admin-command> + <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>( )*none.*/user/USERNAME/dir1</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>setSpaceQuota</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command> + <dfs-admin-command>-fs NAMENODE -setSpaceQuota 1G /user/USERNAME/dir1</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output></expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>setBalancerBandwidth</description> + <test-commands> + <dfs-admin-command>-fs NAMENODE -setBalancerBandwidth 104857600</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command></command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpComparator</type> + <expected-output>Balancer bandwidth is set to 104857600(\n)*</expected-output> + </comparator> + </comparators> + </test> + + <test> + <description>finalizeUpgrade</description> + <test-commands> + <dfs-admin-command>-fs NAMENODE -finalizeUpgrade</dfs-admin-command> + </test-commands> + <cleanup-commands> + <command></command> + </cleanup-commands> + <comparators> + <comparator> + <type>SubstringComparator</type> + <expected-output>Finalize upgrade successful</expected-output> + </comparator> + </comparators> + </test> + <!-- Tests for moveFromLocal --> <test> <!-- TESTED --> <description>moveFromLocal: moving non existent file(absolute path)</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal /user/wrongdata file</command> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir</command> + <command>-fs NAMENODE -moveFromLocal /user/wrongdata /user/USERNAME/dir</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> </cleanup-commands> <comparators> <comparator> @@ -16138,12 +16540,11 @@ <test> <!-- TESTED --> <description>moveFromLocal: moving non existent file(relative path)</description> <test-commands> - <command>-fs NAMENODE -mkdir -p dir</command> <!-- make sure user home dir exists --> - <command>-fs NAMENODE -touchz test</command> - <command>-fs NAMENODE -moveFromLocal wrongdata file</command> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir</command> <!-- make sure user home dir exists --> + <command>-fs NAMENODE -moveFromLocal wrongdata /user/USERNAME/dir</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> </cleanup-commands> <comparators> <comparator> @@ -16156,19 +16557,19 @@ <test> <!-- TESTED --> <description>moveFromLocal: moving many files into an existing file</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes /data15bytes</command> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data30bytes /data30bytes</command> - <command>-fs NAMENODE -mkdir -p dir</command> <!-- make sure user home dir exists --> - <command>-fs NAMENODE -touchz file0</command> - <command>-fs NAMENODE -moveFromLocal /data15bytes /data30bytes file0</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir</command> + <command>-fs NAMENODE -touchz /user/USERNAME/dir/file0</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes /user/USERNAME/dir/file0</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> </cleanup-commands> <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `file0': Is not a directory</expected-output> + <expected-output>moveFromLocal: `/user/USERNAME/dir/file0': Is not a directory</expected-output> </comparator> </comparators> </test> @@ -16176,17 +16577,17 @@ <test> <!-- TESTED --> <description>moveFromLocal: moving many files into a non existent directory</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes /data15bytes</command> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data30bytes /data30bytes</command> - <command>-fs NAMENODE -moveFromLocal /data15bytes /data30bytes wrongdir</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes /user/USERNAME/dir/wrongdir</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r /user/USERNAME</command> </cleanup-commands> <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `wrongdir': No such file or directory</expected-output> + <expected-output>^moveFromLocal: `/user/USERNAME/dir/wrongdir': No such file or directory</expected-output> </comparator> </comparators> </test> @@ -16194,7 +16595,8 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for hdfs:// path - moving non existent file</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal /user/wrongdata hdfs:///file</command> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir</command> + <command>-fs NAMENODE -moveFromLocal /user/wrongdata hdfs:///user/USERNAME/dir/file</command> </test-commands> <cleanup-commands> <command>-fs NAMENODE -rm -r hdfs:///*</command> @@ -16210,8 +16612,11 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for hdfs:// path - moving many files into an existing file</description> <test-commands> - <command>-fs NAMENODE -touchz hdfs:///file0</command> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///file0</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir</command> + <command>-fs NAMENODE -touchz hdfs:///user/USERNAME/dir/file</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes hdfs:///user/USERNAME/dir/file</command> </test-commands> <cleanup-commands> <command>-fs NAMENODE -rm -r hdfs:///*</command> @@ -16219,7 +16624,7 @@ <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `hdfs:///file0': Is not a directory</expected-output> + <expected-output>moveFromLocal: `hdfs:///user/USERNAME/dir/file': Is not a directory</expected-output> </comparator> </comparators> </test> @@ -16227,15 +16632,17 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for hdfs:// path - moving many files into a non existent directory</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///wrongdir</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes hdfs:///user/USERNAME/dir/wrongdir</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r hdfs:///*</command> </cleanup-commands> <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `hdfs:///wrongdir': No such file or directory</expected-output> + <expected-output>moveFromLocal: `hdfs:///user/USERNAME/dir/wrongdir': No such file or directory</expected-output> </comparator> </comparators> </test> @@ -16243,7 +16650,8 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for Namenode's path - moving non existent file</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal /user/wrongdata NAMENODE/file</command> + <command>-fs NAMENODE -mkdir -p NAMENODE/user/USERNAME/dir</command> + <command>-fs NAMENODE -moveFromLocal /user/wrongdata NAMENODE/user/USERNAME/dir</command> </test-commands> <cleanup-commands> <command>-fs NAMENODE -rm -r NAMENODE/*</command> @@ -16259,8 +16667,11 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for Namenode's path - moving many files into an existing file</description> <test-commands> - <command>-fs NAMENODE -touchz NAMENODE/file0</command> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/file0</command> + <command>-fs NAMENODE -mkdir -p NAMENODE/user/USERNAME/dir</command> + <command>-fs NAMENODE -touchz NAMENODE/user/USERNAME/dir/file0</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes NAMENODE/user/USERNAME/dir/file0</command> </test-commands> <cleanup-commands> <command>-fs NAMENODE -rm -r NAMENODE/*</command> @@ -16268,7 +16679,7 @@ <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file0': Is not a directory</expected-output> + <expected-output>moveFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/user/USERNAME/dir/file0': Is not a directory</expected-output> </comparator> </comparators> </test> @@ -16276,15 +16687,19 @@ <test> <!-- TESTED --> <description>moveFromLocal: Test for Namenode's path - moving many files into a non existent directory</description> <test-commands> - <command>-fs NAMENODE -moveFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/wrongdir</command> + <command>-fs NAMENODE -mkdir -p NAMENODE/user/USERNAME</command> + <command>-fs NAMENODE -touchz NAMENODE/user/USERNAME/dir/file0</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data15bytes data15bytes</command> + <command>-fs NAMENODE -cp CLITEST_DATA/data30bytes data30bytes</command> + <command>-fs NAMENODE -moveFromLocal data15bytes data30bytes NAMENODE/user/USERNAME/wrongdir</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user</command> + <command>-fs NAMENODE -rm -r NAMENODE/*</command> </cleanup-commands> <comparators> <comparator> <type>RegexpComparator</type> - <expected-output>^moveFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/wrongdir': No such file or directory</expected-output> + <expected-output>moveFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/user/USERNAME/wrongdir': No such file or directory</expected-output> </comparator> </comparators> </test>
