Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5992. Fix NPE in MD5FileUtils and update editsStored for TestOfflineEditsViewer. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570690 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-02-21 20:02:27 +00:00
parent 37afb4d683
commit 0ad6cdd031
6 changed files with 121 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
View File

@ -69,3 +69,5 @@ HDFS-5535 subtasks:
HDFS-5987. Fix findbugs warnings in Rolling Upgrade branch. (seztszwo via
Arpit Agarwal)
HDFS-5992. Fix NPE in MD5FileUtils and update editsStored for
TestOfflineEditsViewer. (szetszwo)

13
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/MD5FileUtils.java
View File

@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.util;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@ -72,10 +73,6 @@ public abstract class MD5FileUtils {
* where group(1) is the md5 string and group(2) is the data file path.
*/
private static Matcher readStoredMd5(File md5File) throws IOException {
if (!md5File.exists()) {
return null;
}
BufferedReader reader =
new BufferedReader(new InputStreamReader(new FileInputStream(
md5File), Charsets.UTF_8));
@ -105,6 +102,10 @@ public abstract class MD5FileUtils {
*/
public static MD5Hash readStoredMd5ForFile(File dataFile) throws IOException {
final File md5File = getDigestFileForFile(dataFile);
if (!md5File.exists()) {
return null;
}
final Matcher matcher = readStoredMd5(md5File);
String storedHash = matcher.group(1);
File referencedFile = new File(matcher.group(2));
@ -165,6 +166,10 @@ public abstract class MD5FileUtils {
public static void renameMD5File(File oldDataFile, File newDataFile)
throws IOException {
final File fromFile = getDigestFileForFile(oldDataFile);
if (!fromFile.exists()) {
throw new FileNotFoundException(fromFile + " does not exist.");
}
final String digestString = readStoredMd5(fromFile).group(1);
saveMD5File(newDataFile, digestString);

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/OfflineEditsViewerHelper.java
View File

@ -130,7 +130,10 @@ public class OfflineEditsViewerHelper {
DFSTestUtil.runOperations(cluster, dfs, cluster.getConfiguration(0),
dfs.getDefaultBlockSize(), 0);
// OP_ROLLING_UPGRADE_START
cluster.getNamesystem().getEditLog().logStartRollingUpgrade(Time.now());
// OP_ROLLING_UPGRADE_FINALIZE
cluster.getNamesystem().getEditLog().logFinalizeRollingUpgrade(Time.now());
// Force a roll so we get an OP_END_LOG_SEGMENT txn
return cluster.getNameNodeRpc().rollEditLog();

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java
View File

@ -95,6 +95,7 @@ public class TestOfflineEditsViewer {
// edits generated by nnHelper (MiniDFSCluster), should have all op codes
// binary, XML, reparsed binary
String edits = nnHelper.generateEdits();
LOG.info("Generated edits=" + edits);
String editsParsedXml = folder.newFile("editsParsed.xml").getAbsolutePath();
String editsReparsed = folder.newFile("editsParsed").getAbsolutePath();

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

Binary file not shown.

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

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<EDITS>
<<<<<<< .working
<EDITS_VERSION>-50</EDITS_VERSION>
=======
<EDITS_VERSION>-51</EDITS_VERSION>
>>>>>>> .merge-right.r1559304
<EDITS_VERSION>-55</EDITS_VERSION>
<RECORD>
<OPCODE>OP_START_LOG_SEGMENT</OPCODE>
<DATA>
@ -17,13 +13,8 @@
<TXID>2</TXID>
<DELEGATION_KEY>
<KEY_ID>1</KEY_ID>
<<<<<<< .working
<EXPIRY_DATE>1389421314720</EXPIRY_DATE>
<KEY>d2a03d66ebfac521</KEY>
=======
<EXPIRY_DATE>1390519460949</EXPIRY_DATE>
<KEY>dc8d30edc97df67d</KEY>
>>>>>>> .merge-right.r1559304
<EXPIRY_DATE>1393648283650</EXPIRY_DATE>
<KEY>76e6d2854a753680</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@ -33,13 +24,8 @@
<TXID>3</TXID>
<DELEGATION_KEY>
<KEY_ID>2</KEY_ID>
<<<<<<< .working
<EXPIRY_DATE>1389421314722</EXPIRY_DATE>
<KEY>ef94532092f55aef</KEY>
=======
<EXPIRY_DATE>1390519460952</EXPIRY_DATE>
<KEY>096bc20b6debed03</KEY>
>>>>>>> .merge-right.r1559304
<EXPIRY_DATE>1393648283653</EXPIRY_DATE>
<KEY>939fb7b875c956cd</KEY>
</DELEGATION_KEY>
</DATA>
</RECORD>
@ -51,36 +37,18 @@
<INODEID>16386</INODEID>
<PATH>/file_create</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115316</MTIME>
<ATIME>1388730115316</ATIME>
=======
<MTIME>1389828264873</MTIME>
<ATIME>1389828264873</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084379</MTIME>
<ATIME>1392957084379</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>6</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>9</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>7</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -91,22 +59,13 @@
<INODEID>0</INODEID>
<PATH>/file_create</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115327</MTIME>
<ATIME>1388730115316</ATIME>
=======
<MTIME>1389828265699</MTIME>
<ATIME>1389828264873</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084397</MTIME>
<ATIME>1392957084379</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
@ -119,15 +78,9 @@
<LENGTH>0</LENGTH>
<SRC>/file_create</SRC>
<DST>/file_moved</DST>
<<<<<<< .working
<TIMESTAMP>1388730115331</TIMESTAMP>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>8</RPC_CALLID>
=======
<TIMESTAMP>1389828265705</TIMESTAMP>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>11</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<TIMESTAMP>1392957084400</TIMESTAMP>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>9</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -136,15 +89,9 @@
<TXID>7</TXID>
<LENGTH>0</LENGTH>
<PATH>/file_moved</PATH>
<<<<<<< .working
<TIMESTAMP>1388730115336</TIMESTAMP>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>9</RPC_CALLID>
=======
<TIMESTAMP>1389828265712</TIMESTAMP>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>12</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<TIMESTAMP>1392957084413</TIMESTAMP>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>10</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -154,17 +101,9 @@
<LENGTH>0</LENGTH>
<INODEID>16387</INODEID>
<PATH>/directory_mkdir</PATH>
<<<<<<< .working
<TIMESTAMP>1388730115342</TIMESTAMP>
=======
<TIMESTAMP>1389828265722</TIMESTAMP>
>>>>>>> .merge-right.r1559304
<TIMESTAMP>1392957084419</TIMESTAMP>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>493</MODE>
</PERMISSION_STATUS>
@ -197,13 +136,8 @@
<TXID>12</TXID>
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTNAME>snapshot1</SNAPSHOTNAME>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>14</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>17</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>15</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -213,13 +147,8 @@
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
<SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>15</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>18</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>16</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -228,13 +157,8 @@
<TXID>14</TXID>
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTNAME>snapshot2</SNAPSHOTNAME>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>16</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>19</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>17</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -245,36 +169,18 @@
<INODEID>16388</INODEID>
<PATH>/file_create</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115362</MTIME>
<ATIME>1388730115362</ATIME>
=======
<MTIME>1389828265757</MTIME>
<ATIME>1389828265757</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084440</MTIME>
<ATIME>1392957084440</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>17</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>20</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>18</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -285,22 +191,13 @@
<INODEID>0</INODEID>
<PATH>/file_create</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115363</MTIME>
<ATIME>1388730115362</ATIME>
=======
<MTIME>1389828265759</MTIME>
<ATIME>1389828265757</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084441</MTIME>
<ATIME>1392957084440</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
@ -356,19 +253,10 @@
<LENGTH>0</LENGTH>
<SRC>/file_create</SRC>
<DST>/file_moved</DST>
<<<<<<< .working
<TIMESTAMP>1388730115378</TIMESTAMP>
=======
<TIMESTAMP>1389828265782</TIMESTAMP>
>>>>>>> .merge-right.r1559304
<TIMESTAMP>1392957084455</TIMESTAMP>
<OPTIONS>NONE</OPTIONS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>24</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>27</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>25</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -379,36 +267,18 @@
<INODEID>16389</INODEID>
<PATH>/file_concat_target</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115382</MTIME>
<ATIME>1388730115382</ATIME>
=======
<MTIME>1389828265787</MTIME>
<ATIME>1389828265787</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084459</MTIME>
<ATIME>1392957084459</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>26</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>29</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>27</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -513,13 +383,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_target</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115461</MTIME>
<ATIME>1388730115382</ATIME>
=======
<MTIME>1389828266540</MTIME>
<ATIME>1389828265787</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084525</MTIME>
<ATIME>1392957084459</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@ -539,11 +404,7 @@
<GENSTAMP>1003</GENSTAMP>
</BLOCK>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
@ -557,36 +418,18 @@
<INODEID>16390</INODEID>
<PATH>/file_concat_0</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115463</MTIME>
<ATIME>1388730115463</ATIME>
=======
<MTIME>1389828266544</MTIME>
<ATIME>1389828266544</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084527</MTIME>
<ATIME>1392957084527</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>39</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>41</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>40</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -691,13 +534,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_0</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115477</MTIME>
<ATIME>1388730115463</ATIME>
=======
<MTIME>1389828266569</MTIME>
<ATIME>1389828266544</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084542</MTIME>
<ATIME>1392957084527</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@ -717,11 +555,7 @@
<GENSTAMP>1006</GENSTAMP>
</BLOCK>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
@ -735,36 +569,18 @@
<INODEID>16391</INODEID>
<PATH>/file_concat_1</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115479</MTIME>
<ATIME>1388730115479</ATIME>
=======
<MTIME>1389828266572</MTIME>
<ATIME>1389828266572</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084544</MTIME>
<ATIME>1392957084544</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>51</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>53</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>52</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -869,13 +685,8 @@
<INODEID>0</INODEID>
<PATH>/file_concat_1</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115495</MTIME>
<ATIME>1388730115479</ATIME>
=======
<MTIME>1389828266599</MTIME>
<ATIME>1389828266572</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084559</MTIME>
<ATIME>1392957084544</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@ -895,11 +706,7 @@
<GENSTAMP>1009</GENSTAMP>
</BLOCK>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
@ -911,22 +718,13 @@
<TXID>56</TXID>
<LENGTH>0</LENGTH>
<TRG>/file_concat_target</TRG>
<<<<<<< .working
<TIMESTAMP>1388730115498</TIMESTAMP>
=======
<TIMESTAMP>1389828266603</TIMESTAMP>
>>>>>>> .merge-right.r1559304
<TIMESTAMP>1392957084561</TIMESTAMP>
<SOURCES>
<SOURCE1>/file_concat_0</SOURCE1>
<SOURCE2>/file_concat_1</SOURCE2>
</SOURCES>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>62</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>64</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>63</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -937,190 +735,37 @@
<INODEID>16392</INODEID>
<PATH>/file_symlink</PATH>
<VALUE>/file_concat_target</VALUE>
<<<<<<< .working
<MTIME>1388730115502</MTIME>
<ATIME>1388730115502</ATIME>
=======
<MTIME>1389828266633</MTIME>
<ATIME>1389828266633</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084564</MTIME>
<ATIME>1392957084564</ATIME>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>511</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>63</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>66</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>64</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ADD</OPCODE>
<DATA>
<TXID>58</TXID>
<<<<<<< .working
<DELEGATION_TOKEN_IDENTIFIER>
<KIND>HDFS_DELEGATION_TOKEN</KIND>
<SEQUENCE_NUMBER>1</SEQUENCE_NUMBER>
<OWNER>szetszwo</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1388730115505</ISSUE_DATE>
<MAX_DATE>1389334915505</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
<EXPIRY_TIME>1388816515505</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_RENEW_DELEGATION_TOKEN</OPCODE>
<DATA>
<TXID>59</TXID>
<DELEGATION_TOKEN_IDENTIFIER>
<KIND>HDFS_DELEGATION_TOKEN</KIND>
<SEQUENCE_NUMBER>1</SEQUENCE_NUMBER>
<OWNER>szetszwo</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1388730115505</ISSUE_DATE>
<MAX_DATE>1389334915505</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
<EXPIRY_TIME>1388816515564</EXPIRY_TIME>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_CANCEL_DELEGATION_TOKEN</OPCODE>
<DATA>
<TXID>60</TXID>
<DELEGATION_TOKEN_IDENTIFIER>
<KIND>HDFS_DELEGATION_TOKEN</KIND>
<SEQUENCE_NUMBER>1</SEQUENCE_NUMBER>
<OWNER>szetszwo</OWNER>
<RENEWER>JobTracker</RENEWER>
<REALUSER></REALUSER>
<ISSUE_DATE>1388730115505</ISSUE_DATE>
<MAX_DATE>1389334915505</MAX_DATE>
<MASTER_KEY_ID>2</MASTER_KEY_ID>
</DELEGATION_TOKEN_IDENTIFIER>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ADD_CACHE_POOL</OPCODE>
<DATA>
<TXID>61</TXID>
<POOLNAME>poolparty</POOLNAME>
<OWNERNAME>szetszwo</OWNERNAME>
<GROUPNAME>staff</GROUPNAME>
<MODE>493</MODE>
<LIMIT>9223372036854775807</LIMIT>
<MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>67</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_MODIFY_CACHE_POOL</OPCODE>
<DATA>
<TXID>62</TXID>
<POOLNAME>poolparty</POOLNAME>
<OWNERNAME>carlton</OWNERNAME>
<GROUPNAME>party</GROUPNAME>
<MODE>448</MODE>
<LIMIT>1989</LIMIT>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>68</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ADD_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>63</TXID>
<ID>1</ID>
<PATH>/bar</PATH>
<REPLICATION>1</REPLICATION>
<POOL>poolparty</POOL>
<EXPIRATION>2305844397943809533</EXPIRATION>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>69</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_MODIFY_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>64</TXID>
<ID>1</ID>
<PATH>/bar2</PATH>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>70</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_REMOVE_CACHE_DIRECTIVE</OPCODE>
<DATA>
<TXID>65</TXID>
<ID>1</ID>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>71</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_REMOVE_CACHE_POOL</OPCODE>
<DATA>
<TXID>66</TXID>
<POOLNAME>poolparty</POOLNAME>
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>72</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ADD</OPCODE>
<DATA>
<TXID>67</TXID>
=======
>>>>>>> .merge-right.r1559304
<LENGTH>0</LENGTH>
<INODEID>16393</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730115596</MTIME>
<ATIME>1388730115596</ATIME>
=======
<MTIME>1389828266637</MTIME>
<ATIME>1389828266637</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957084567</MTIME>
<ATIME>1392957084567</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<<<<<<< .working
<CLIENT_NAME>DFSClient_NONMAPREDUCE_381408282_1</CLIENT_NAME>
=======
<CLIENT_NAME>DFSClient_NONMAPREDUCE_16108824_1</CLIENT_NAME>
>>>>>>> .merge-right.r1559304
<CLIENT_NAME>DFSClient_NONMAPREDUCE_-1178237747_1</CLIENT_NAME>
<CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
<<<<<<< .working
<RPC_CLIENTID>8205c453-0c7f-4b25-955a-7786e56bce86</RPC_CLIENTID>
<RPC_CALLID>73</RPC_CALLID>
=======
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>67</RPC_CALLID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>65</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1175,38 +820,22 @@
<RECORD>
<OPCODE>OP_REASSIGN_LEASE</OPCODE>
<DATA>
<<<<<<< .working
<TXID>73</TXID>
<LEASEHOLDER>DFSClient_NONMAPREDUCE_381408282_1</LEASEHOLDER>
=======
<TXID>64</TXID>
<LEASEHOLDER>DFSClient_NONMAPREDUCE_16108824_1</LEASEHOLDER>
>>>>>>> .merge-right.r1559304
<LEASEHOLDER>DFSClient_NONMAPREDUCE_-1178237747_1</LEASEHOLDER>
<PATH>/hard-lease-recovery-test</PATH>
<NEWHOLDER>HDFS_NameNode</NEWHOLDER>
</DATA>
</RECORD>
<RECORD>
<<<<<<< .working
<OPCODE>OP_CLOSE</OPCODE>
<DATA>
<TXID>74</TXID>
=======
<OPCODE>OP_CLOSE</OPCODE>
<DATA>
<TXID>65</TXID>
>>>>>>> .merge-right.r1559304
<LENGTH>0</LENGTH>
<INODEID>0</INODEID>
<PATH>/hard-lease-recovery-test</PATH>
<REPLICATION>1</REPLICATION>
<<<<<<< .working
<MTIME>1388730118281</MTIME>
<ATIME>1388730115596</ATIME>
=======
<MTIME>1389828269751</MTIME>
<ATIME>1389828266637</ATIME>
>>>>>>> .merge-right.r1559304
<MTIME>1392957087263</MTIME>
<ATIME>1392957084567</ATIME>
<BLOCKSIZE>512</BLOCKSIZE>
<CLIENT_NAME></CLIENT_NAME>
<CLIENT_MACHINE></CLIENT_MACHINE>
@ -1216,36 +845,24 @@
<GENSTAMP>1011</GENSTAMP>
</BLOCK>
<PERMISSION_STATUS>
<<<<<<< .working
<USERNAME>szetszwo</USERNAME>
=======
<USERNAME>jing</USERNAME>
>>>>>>> .merge-right.r1559304
<GROUPNAME>supergroup</GROUPNAME>
<MODE>420</MODE>
</PERMISSION_STATUS>
</DATA>
</RECORD>
<RECORD>
<<<<<<< .working
<OPCODE>OP_UPGRADE_MARKER</OPCODE>
<DATA>
<TXID>75</TXID>
</DATA>
</RECORD>
<RECORD>
=======
<OPCODE>OP_ADD_CACHE_POOL</OPCODE>
<DATA>
<TXID>66</TXID>
<POOLNAME>pool1</POOLNAME>
<OWNERNAME>jing</OWNERNAME>
<OWNERNAME>szetszwo</OWNERNAME>
<GROUPNAME>staff</GROUPNAME>
<MODE>493</MODE>
<LIMIT>9223372036854775807</LIMIT>
<MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>74</RPC_CALLID>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>72</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1254,8 +871,8 @@
<TXID>67</TXID>
<POOLNAME>pool1</POOLNAME>
<LIMIT>99</LIMIT>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>75</RPC_CALLID>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>73</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1266,9 +883,9 @@
<PATH>/path</PATH>
<REPLICATION>1</REPLICATION>
<POOL>pool1</POOL>
<EXPIRATION>2305844399041964876</EXPIRATION>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>76</RPC_CALLID>
<EXPIRATION>2305844402170781554</EXPIRATION>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>74</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1277,8 +894,8 @@
<TXID>69</TXID>
<ID>1</ID>
<REPLICATION>2</REPLICATION>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>77</RPC_CALLID>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>75</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1286,8 +903,8 @@
<DATA>
<TXID>70</TXID>
<ID>1</ID>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>78</RPC_CALLID>
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>76</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
@ -1295,26 +912,35 @@
<DATA>
<TXID>71</TXID>
<POOLNAME>pool1</POOLNAME>
<RPC_CLIENTID>b5928e80-e373-4807-a688-f94483d08ce5</RPC_CLIENTID>
<RPC_CALLID>79</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
>>>>>>> .merge-right.r1559304
<OPCODE>OP_END_LOG_SEGMENT</OPCODE>
<DATA>
<<<<<<< .working
<TXID>76</TXID>
=======
<TXID>72</TXID>
>>>>>>> .merge-right.r1559304
<RPC_CLIENTID>ad7d1b9e-e5d3-4d8d-ae1a-060f579be11e</RPC_CLIENTID>
<RPC_CALLID>77</RPC_CALLID>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_SET_ACL</OPCODE>
<DATA>
<TXID>72</TXID>
<SRC>/file_concat_target</SRC>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ROLLING_UPGRADE_START</OPCODE>
<DATA>
<TXID>73</TXID>
<SRC>/file_set_acl</SRC>
<STARTTIME>1392957087621</STARTTIME>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_ROLLING_UPGRADE_FINALIZE</OPCODE>
<DATA>
<TXID>74</TXID>
<FINALIZETIME>1392957087621</FINALIZETIME>
</DATA>
</RECORD>
<RECORD>
<OPCODE>OP_END_LOG_SEGMENT</OPCODE>
<DATA>
<TXID>75</TXID>
</DATA>
</RECORD>
</EDITS>