Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml?rev=1572308&r1=1572307&r2=1572308&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml Wed Feb 26 22:32:27 2014 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <EDITS> - <EDITS_VERSION>-52</EDITS_VERSION> + <EDITS_VERSION>-53</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>1390942564729</EXPIRY_DATE> - <KEY>f270a35a4ebb9984</KEY> + <EXPIRY_DATE>1390519460949</EXPIRY_DATE> + <KEY>dc8d30edc97df67d</KEY> </DELEGATION_KEY> </DATA> </RECORD> @@ -24,8 +24,8 @@ <TXID>3</TXID> <DELEGATION_KEY> <KEY_ID>2</KEY_ID> - <EXPIRY_DATE>1390942564735</EXPIRY_DATE> - <KEY>22391ec22bc0fc20</KEY> + <EXPIRY_DATE>1390519460952</EXPIRY_DATE> + <KEY>096bc20b6debed03</KEY> </DELEGATION_KEY> </DATA> </RECORD> @@ -37,18 +37,18 @@ <INODEID>16386</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251365583</MTIME> - <ATIME>1390251365583</ATIME> + <MTIME>1389828264873</MTIME> + <ATIME>1389828264873</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>7</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>9</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -59,13 +59,13 @@ <INODEID>0</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251365626</MTIME> - <ATIME>1390251365583</ATIME> + <MTIME>1389828265699</MTIME> + <ATIME>1389828264873</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>1390251365645</TIMESTAMP> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>9</RPC_CALLID> + <TIMESTAMP>1389828265705</TIMESTAMP> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>1390251365666</TIMESTAMP> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>10</RPC_CALLID> + <TIMESTAMP>1389828265712</TIMESTAMP> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>12</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -101,9 +101,9 @@ <LENGTH>0</LENGTH> <INODEID>16387</INODEID> <PATH>/directory_mkdir</PATH> - <TIMESTAMP>1390251365693</TIMESTAMP> + <TIMESTAMP>1389828265722</TIMESTAMP> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>15</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>16</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>17</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>19</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -169,18 +169,18 @@ <INODEID>16388</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251365804</MTIME> - <ATIME>1390251365804</ATIME> + <MTIME>1389828265757</MTIME> + <ATIME>1389828265757</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>18</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>20</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -191,13 +191,13 @@ <INODEID>0</INODEID> <PATH>/file_create</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251365815</MTIME> - <ATIME>1390251365804</ATIME> + <MTIME>1389828265759</MTIME> + <ATIME>1389828265757</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>1390251365931</TIMESTAMP> + <TIMESTAMP>1389828265782</TIMESTAMP> <OPTIONS>NONE</OPTIONS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>25</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>1390251365952</MTIME> - <ATIME>1390251365952</ATIME> + <MTIME>1389828265787</MTIME> + <ATIME>1389828265787</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>27</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>29</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -383,8 +383,8 @@ <INODEID>0</INODEID> <PATH>/file_concat_target</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251366514</MTIME> - <ATIME>1390251365952</ATIME> + <MTIME>1389828266540</MTIME> + <ATIME>1389828265787</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -404,7 +404,7 @@ <GENSTAMP>1003</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>1390251366533</MTIME> - <ATIME>1390251366533</ATIME> + <MTIME>1389828266544</MTIME> + <ATIME>1389828266544</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>40</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>1390251366726</MTIME> - <ATIME>1390251366533</ATIME> + <MTIME>1389828266569</MTIME> + <ATIME>1389828266544</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -555,7 +555,7 @@ <GENSTAMP>1006</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>1390251366746</MTIME> - <ATIME>1390251366746</ATIME> + <MTIME>1389828266572</MTIME> + <ATIME>1389828266572</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>52</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>1390251366795</MTIME> - <ATIME>1390251366746</ATIME> + <MTIME>1389828266599</MTIME> + <ATIME>1389828266572</ATIME> <BLOCKSIZE>512</BLOCKSIZE> <CLIENT_NAME></CLIENT_NAME> <CLIENT_MACHINE></CLIENT_MACHINE> @@ -706,7 +706,7 @@ <GENSTAMP>1009</GENSTAMP> </BLOCK> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</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>1390251366802</TIMESTAMP> + <TIMESTAMP>1389828266603</TIMESTAMP> <SOURCES> <SOURCE1>/file_concat_0</SOURCE1> <SOURCE2>/file_concat_1</SOURCE2> </SOURCES> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>63</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</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>1390251366811</MTIME> - <ATIME>1390251366811</ATIME> + <MTIME>1389828266633</MTIME> + <ATIME>1389828266633</ATIME> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>511</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>64</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>66</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -754,18 +754,18 @@ <INODEID>16393</INODEID> <PATH>/hard-lease-recovery-test</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251366819</MTIME> - <ATIME>1390251366819</ATIME> + <MTIME>1389828266637</MTIME> + <ATIME>1389828266637</ATIME> <BLOCKSIZE>512</BLOCKSIZE> - <CLIENT_NAME>DFSClient_NONMAPREDUCE_382541401_1</CLIENT_NAME> + <CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME> <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE> <PERMISSION_STATUS> - <USERNAME>andrew</USERNAME> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>65</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>67</RPC_CALLID> </DATA> </RECORD> <RECORD> @@ -821,23 +821,7 @@ <OPCODE>OP_REASSIGN_LEASE</OPCODE> <DATA> <TXID>64</TXID> - <LEASEHOLDER>DFSClient_NONMAPREDUCE_382541401_1</LEASEHOLDER> - <PATH>/hard-lease-recovery-test</PATH> - <NEWHOLDER>HDFS_NameNode</NEWHOLDER> - </DATA> - </RECORD> - <RECORD> - <OPCODE>OP_SET_GENSTAMP_V2</OPCODE> - <DATA> - <TXID>65</TXID> - <GENSTAMPV2>1012</GENSTAMPV2> - </DATA> - </RECORD> - <RECORD> - <OPCODE>OP_REASSIGN_LEASE</OPCODE> - <DATA> - <TXID>66</TXID> - <LEASEHOLDER>HDFS_NameNode</LEASEHOLDER> + <LEASEHOLDER>DFSClient_NONMAPREDUCE_16108824_1</LEASEHOLDER> <PATH>/hard-lease-recovery-test</PATH> <NEWHOLDER>HDFS_NameNode</NEWHOLDER> </DATA> @@ -845,23 +829,23 @@ <RECORD> <OPCODE>OP_CLOSE</OPCODE> <DATA> - <TXID>67</TXID> + <TXID>65</TXID> <LENGTH>0</LENGTH> <INODEID>0</INODEID> <PATH>/hard-lease-recovery-test</PATH> <REPLICATION>1</REPLICATION> - <MTIME>1390251371402</MTIME> - <ATIME>1390251366819</ATIME> + <MTIME>1389828269751</MTIME> + <ATIME>1389828266637</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> + <USERNAME>jing</USERNAME> <GROUPNAME>supergroup</GROUPNAME> <MODE>420</MODE> </PERMISSION_STATUS> @@ -870,72 +854,79 @@ <RECORD> <OPCODE>OP_ADD_CACHE_POOL</OPCODE> <DATA> - <TXID>68</TXID> + <TXID>66</TXID> <POOLNAME>pool1</POOLNAME> - <OWNERNAME>andrew</OWNERNAME> - <GROUPNAME>andrew</GROUPNAME> + <OWNERNAME>jing</OWNERNAME> + <GROUPNAME>staff</GROUPNAME> <MODE>493</MODE> <LIMIT>9223372036854775807</LIMIT> <MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>73</RPC_CALLID> + <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>69</TXID> + <TXID>67</TXID> <POOLNAME>pool1</POOLNAME> <LIMIT>99</LIMIT> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>74</RPC_CALLID> + <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>70</TXID> + <TXID>68</TXID> <ID>1</ID> <PATH>/path</PATH> <REPLICATION>1</REPLICATION> <POOL>pool1</POOL> - <EXPIRATION>2305844399465065912</EXPIRATION> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>75</RPC_CALLID> + <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>71</TXID> + <TXID>69</TXID> <ID>1</ID> <REPLICATION>2</REPLICATION> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>76</RPC_CALLID> + <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>72</TXID> + <TXID>70</TXID> <ID>1</ID> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>77</RPC_CALLID> + <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>73</TXID> + <TXID>71</TXID> <POOLNAME>pool1</POOLNAME> - <RPC_CLIENTID>ff209a09-9745-4242-837f-21c6b95a1b70</RPC_CLIENTID> - <RPC_CALLID>78</RPC_CALLID> + <RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID> + <RPC_CALLID>79</RPC_CALLID> </DATA> </RECORD> <RECORD> <OPCODE>OP_END_LOG_SEGMENT</OPCODE> <DATA> - <TXID>74</TXID> + <TXID>72</TXID> + </DATA> + </RECORD> + <RECORD> + <OPCODE>OP_SET_ACL</OPCODE> + <DATA> + <TXID>73</TXID> + <SRC>/file_set_acl</SRC> </DATA> </RECORD> </EDITS>
Copied: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml (from r1569870, hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml) URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?p2=hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml&p1=hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml&r1=1569870&r2=1572308&rev=1572308&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml Wed Feb 26 22:32:27 2014 @@ -846,15 +846,15 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^user:charlie:rwx\s+#effective:r-x$</expected-output> + <expected-output>^user:charlie:rwx\t#effective:r-x$</expected-output> </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^group::-wx\s+#effective:--x$</expected-output> + <expected-output>^group::-wx\t#effective:--x$</expected-output> </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^group:sales:rwx\s+#effective:r-x$</expected-output> + <expected-output>^group:sales:rwx\t#effective:r-x$</expected-output> </comparator> <comparator> <type>SubstringComparator</type> @@ -870,15 +870,15 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^default:user:charlie:rwx\s+#effective:rw-$</expected-output> + <expected-output>^default:user:charlie:rwx\t#effective:rw-$</expected-output> </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^default:group::r-x\s+#effective:r--$</expected-output> + <expected-output>^default:group::r-x\t#effective:r--$</expected-output> </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^default:group:sales:rwx\s+#effective:rw-$</expected-output> + <expected-output>^default:group:sales:rwx\t#effective:rw-$</expected-output> </comparator> <comparator> <type>SubstringComparator</type> @@ -911,5 +911,66 @@ </comparator> </comparators> </test> + <test> + <description>setfacl: recursive modify entries with mix of files and directories</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /dir1</command> + <command>-fs NAMENODE -touchz /dir1/file1</command> + <command>-fs NAMENODE -mkdir -p /dir1/dir2</command> + <command>-fs NAMENODE -touchz /dir1/dir2/file2</command> + <command>-fs NAMENODE -setfacl -R -m user:charlie:rwx,default:user:charlie:r-x /dir1</command> + <command>-fs NAMENODE -getfacl -R /dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -R /dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r--#LF#mask::rwx#LF#other::r--#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r--#LF#mask::rwx#LF#other::r--#LF##LF#</expected-output> + </comparator> + </comparators> + </test> + <test> + <description>setfacl: recursive remove entries with mix of files and directories</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /dir1</command> + <command>-fs NAMENODE -touchz /dir1/file1</command> + <command>-fs NAMENODE -mkdir -p /dir1/dir2</command> + <command>-fs NAMENODE -touchz /dir1/dir2/file2</command> + <command>-fs NAMENODE -setfacl -R -m user:bob:rwx,user:charlie:rwx,default:user:bob:rwx,default:user:charlie:r-x /dir1</command> + <command>-fs NAMENODE -setfacl -R -x user:bob,default:user:bob /dir1</command> + <command>-fs NAMENODE -getfacl -R /dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -R /dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r--#LF#mask::rwx#LF#other::r--#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r--#LF#mask::rwx#LF#other::r--#LF##LF#</expected-output> + </comparator> + </comparators> + </test> + <test> + <description>setfacl: recursive set with mix of files and directories</description> + <test-commands> + <command>-fs NAMENODE -mkdir -p /dir1</command> + <command>-fs NAMENODE -touchz /dir1/file1</command> + <command>-fs NAMENODE -mkdir -p /dir1/dir2</command> + <command>-fs NAMENODE -touchz /dir1/dir2/file2</command> + <command>-fs NAMENODE -setfacl -R --set user::rwx,user:charlie:rwx,group::r-x,other::r-x,default:user:charlie:r-x /dir1</command> + <command>-fs NAMENODE -getfacl -R /dir1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -R /dir1</command> + </cleanup-commands> + <comparators> + <comparator> + <type>ExactComparator</type> + <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF##LF#</expected-output> + </comparator> + </comparators> + </test> </tests> </configuration>
