hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject [12/12] git commit: Merge changes from trunk
Date Wed, 10 Sep 2014 05:48:39 GMT
Merge changes from trunk


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db41a1b7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db41a1b7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db41a1b7

Branch: refs/heads/HDFS-6584
Commit: db41a1b7b944185e5e60a7fdf8cf43172b006a73
Parents: 4124905 6dae4b4
Author: Jing Zhao <jing9@apache.org>
Authored: Tue Sep 9 22:47:50 2014 -0700
Committer: Jing Zhao <jing9@apache.org>
Committed: Tue Sep 9 22:47:50 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   9 +-
 .../hadoop/util/NativeLibraryChecker.java       |  22 +-
 .../hadoop/util/TestNativeLibraryChecker.java   |  29 +++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  16 +-
 .../hadoop/hdfs/server/balancer/Balancer.java   |   8 +-
 .../server/blockmanagement/BlockManager.java    |  21 +-
 .../server/blockmanagement/DatanodeManager.java |   6 +-
 .../server/blockmanagement/HostFileManager.java |   4 -
 .../hdfs/server/datanode/BPOfferService.java    |   9 +-
 .../hdfs/server/datanode/BPServiceActor.java    |   2 +-
 .../server/datanode/BlockPoolSliceStorage.java  | 120 +++++++++--
 .../hdfs/server/datanode/DataStorage.java       |  31 ++-
 .../server/datanode/fsdataset/FsDatasetSpi.java |  11 +
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |  10 +
 .../server/namenode/EncryptionZoneManager.java  |  12 ++
 .../hdfs/server/namenode/FSDirectory.java       |   2 +-
 .../server/namenode/FSImageFormatPBINode.java   |  18 +-
 .../hdfs/server/namenode/FSNamesystem.java      |  46 ++---
 .../server/namenode/NameNodeLayoutVersion.java  |   5 +-
 .../hadoop-hdfs/src/main/proto/fsimage.proto    |   8 +-
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |  37 ++++
 .../apache/hadoop/hdfs/TestEncryptionZones.java |   8 +
 .../hdfs/server/balancer/TestBalancer.java      |   5 +-
 .../server/datanode/SimulatedFSDataset.java     |   8 +
 .../datanode/TestDataNodeRollingUpgrade.java    | 205 ++++++++++++++++---
 .../hdfs/server/namenode/FSXAttrBaseTest.java   |  75 ++++---
 .../hdfs/server/namenode/NameNodeAdapter.java   |   2 +-
 .../hadoop-hdfs/src/test/resources/editsStored  | Bin 4992 -> 4999 bytes
 .../src/test/resources/editsStored.xml          | 138 ++++++-------
 .../yarn/sls/appmaster/MRAMSimulator.java       |  43 ++--
 hadoop-yarn-project/CHANGES.txt                 |   6 +
 31 files changed, 673 insertions(+), 243 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 9b030e7,8470680..956900d
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@@ -398,27 -394,7 +397,11 @@@ public class BlockManager 
            lifetimeMin*60*1000L, 0, null, encryptionAlgorithm);
      }
    }
 -  
 +
 +  public BlockStoragePolicy getStoragePolicy(final String policyName) {
 +    return storagePolicySuite.getPolicy(policyName);
 +  }
 +
-   public long getReplicationRecheckInterval() {
-     return replicationRecheckInterval;
-   }
- 
-   public AtomicLong excessBlocksCount() {
-     return excessBlocksCount;
-   }
- 
-   public void clearInvalidateBlocks() {
-     invalidateBlocks.clear();
-   }
- 
-   void setReplicationMonitor(Runnable replicationMonitor) {
-     replicationThread = new Daemon(replicationMonitor);
-   }
- 
    public void setBlockPoolId(String blockPoolId) {
      if (isBlockTokenEnabled()) {
        blockTokenSecretManager.setBlockPoolId(blockPoolId);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
index c2896cf,404e205..512913b
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
@@@ -67,8 -67,8 +67,9 @@@ public class NameNodeLayoutVersion 
      EDITLOG_LENGTH(-56, "Add length field to every edit log op"),
      XATTRS(-57, "Extended attributes"),
      CREATE_OVERWRITE(-58, "Use single editlog record for " +
-         "creating file with overwrite"),
-     BLOCK_STORAGE_POLICY(-59, "Block Storage policy");
+       "creating file with overwrite"),
 -    XATTRS_NAMESPACE_EXT(-59, "Increase number of xattr namespaces");
++    XATTRS_NAMESPACE_EXT(-59, "Increase number of xattr namespaces"),
++    BLOCK_STORAGE_POLICY(-60, "Block Storage policy");
      
      private final FeatureInfo info;
  

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
index a1aa7d6,e3a265f..e8a2484
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
@@@ -1458,54 -1405,37 +1461,88 @@@ public class DFSTestUtil 
      return expectedPrimary.getDatanodeDescriptor();
    }
  
 +  public static void toolRun(Tool tool, String cmd, int retcode, String contain)
 +      throws Exception {
 +    String [] cmds = StringUtils.split(cmd, ' ');
 +    System.out.flush();
 +    System.err.flush();
 +    PrintStream origOut = System.out;
 +    PrintStream origErr = System.err;
 +    String output = null;
 +    int ret = 0;
 +    try {
 +      ByteArrayOutputStream bs = new ByteArrayOutputStream(1024);
 +      PrintStream out = new PrintStream(bs);
 +      System.setOut(out);
 +      System.setErr(out);
 +      ret = tool.run(cmds);
 +      System.out.flush();
 +      System.err.flush();
 +      out.close();
 +      output = bs.toString();
 +    } finally {
 +      System.setOut(origOut);
 +      System.setErr(origErr);
 +    }
 +    System.out.println("Output for command: " + cmd + " retcode: " + ret);
 +    if (output != null) {
 +      System.out.println(output);
 +    }
 +    assertEquals(retcode, ret);
 +    if (contain != null) {
 +      assertTrue("The real output is: " + output + ".\n It should contain: "
 +          + contain, output.contains(contain));
 +    }
 +  }
 +
 +  public static void FsShellRun(String cmd, int retcode, String contain,
 +      Configuration conf) throws Exception {
 +    FsShell shell = new FsShell(new Configuration(conf));
 +    toolRun(shell, cmd, retcode, contain);
 +  }  
 +
 +  public static void DFSAdminRun(String cmd, int retcode, String contain,
 +      Configuration conf) throws Exception {
 +    DFSAdmin admin = new DFSAdmin(new Configuration(conf));
 +    toolRun(admin, cmd, retcode, contain);
 +  }
 +
 +  public static void FsShellRun(String cmd, Configuration conf)
 +      throws Exception {
 +    FsShellRun(cmd, 0, null, conf);
 +  }
++
+   public static void addDataNodeLayoutVersion(final int lv, final String description)
+       throws NoSuchFieldException, IllegalAccessException {
+     Preconditions.checkState(lv < DataNodeLayoutVersion.CURRENT_LAYOUT_VERSION);
+ 
+     // Override {@link DataNodeLayoutVersion#CURRENT_LAYOUT_VERSION} via reflection.
+     Field modifiersField = Field.class.getDeclaredField("modifiers");
+     modifiersField.setAccessible(true);
+     Field field = DataNodeLayoutVersion.class.getField("CURRENT_LAYOUT_VERSION");
+     field.setAccessible(true);
+     modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+     field.setInt(null, lv);
+ 
+     // Override {@link HdfsConstants#DATANODE_LAYOUT_VERSION}
+     field = HdfsConstants.class.getField("DATANODE_LAYOUT_VERSION");
+     field.setAccessible(true);
+     modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+     field.setInt(null, lv);
+ 
+     // Inject the feature into the FEATURES map.
+     final LayoutVersion.FeatureInfo featureInfo =
+         new LayoutVersion.FeatureInfo(lv, lv + 1, description, false);
+     final LayoutVersion.LayoutFeature feature =
+         new LayoutVersion.LayoutFeature() {
+       @Override
+       public LayoutVersion.FeatureInfo getInfo() {
+         return featureInfo;
+       }
+     };
+ 
+     // Update the FEATURES map with the new layout version.
+     LayoutVersion.updateMap(DataNodeLayoutVersion.FEATURES,
+                             new LayoutVersion.LayoutFeature[] { feature });
+   }
  }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored
index 3b66d43,754f690..ecfbb9f
Binary files differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/db41a1b7/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
index c8eecc3,7cfb689..8cafa9f
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <EDITS>
--  <EDITS_VERSION>-59</EDITS_VERSION>
++  <EDITS_VERSION>-60</EDITS_VERSION>
    <RECORD>
      <OPCODE>OP_START_LOG_SEGMENT</OPCODE>
      <DATA>
@@@ -13,8 -13,8 +13,8 @@@
        <TXID>2</TXID>
        <DELEGATION_KEY>
          <KEY_ID>1</KEY_ID>
-         <EXPIRY_DATE>1410634509611</EXPIRY_DATE>
-         <KEY>201e2572e03d089c</KEY>
 -        <EXPIRY_DATE>1403590428625</EXPIRY_DATE>
 -        <KEY>16f34bfba67b2552</KEY>
++        <EXPIRY_DATE>1410915997709</EXPIRY_DATE>
++        <KEY>309e81e09dc6c75a</KEY>
        </DELEGATION_KEY>
      </DATA>
    </RECORD>
@@@ -24,8 -24,8 +24,8 @@@
        <TXID>3</TXID>
        <DELEGATION_KEY>
          <KEY_ID>2</KEY_ID>
-         <EXPIRY_DATE>1410634509614</EXPIRY_DATE>
-         <KEY>ef4542e27fb38301</KEY>
 -        <EXPIRY_DATE>1403590428631</EXPIRY_DATE>
 -        <KEY>dbe6282854469833</KEY>
++        <EXPIRY_DATE>1410915997711</EXPIRY_DATE>
++        <KEY>8a2399843e754bee</KEY>
        </DELEGATION_KEY>
      </DATA>
    </RECORD>
@@@ -37,19 -37,19 +37,19 @@@
        <INODEID>16386</INODEID>
        <PATH>/file_create</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310217</MTIME>
-       <ATIME>1409943310217</ATIME>
 -      <MTIME>1402899229669</MTIME>
 -      <ATIME>1402899229669</ATIME>
++      <MTIME>1410224798292</MTIME>
++      <ATIME>1410224798292</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
 -      <OVERWRITE>false</OVERWRITE>
 +      <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>8</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>5</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -60,8 -60,8 +60,8 @@@
        <INODEID>0</INODEID>
        <PATH>/file_create</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310240</MTIME>
-       <ATIME>1409943310217</ATIME>
 -      <MTIME>1402899229711</MTIME>
 -      <ATIME>1402899229669</ATIME>
++      <MTIME>1410224798315</MTIME>
++      <ATIME>1410224798292</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -88,20 -80,20 +88,20 @@@
        <LENGTH>0</LENGTH>
        <SRC>/file_create</SRC>
        <DST>/file_moved</DST>
-       <TIMESTAMP>1409943310247</TIMESTAMP>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <TIMESTAMP>1402899229718</TIMESTAMP>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>10</RPC_CALLID>
++      <TIMESTAMP>1410224798322</TIMESTAMP>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>8</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_DELETE</OPCODE>
      <DATA>
 -      <TXID>7</TXID>
 +      <TXID>8</TXID>
        <LENGTH>0</LENGTH>
        <PATH>/file_moved</PATH>
-       <TIMESTAMP>1409943310253</TIMESTAMP>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <TIMESTAMP>1402899229730</TIMESTAMP>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>11</RPC_CALLID>
++      <TIMESTAMP>1410224798328</TIMESTAMP>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>9</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -111,9 -103,9 +111,9 @@@
        <LENGTH>0</LENGTH>
        <INODEID>16387</INODEID>
        <PATH>/directory_mkdir</PATH>
-       <TIMESTAMP>1409943310260</TIMESTAMP>
 -      <TIMESTAMP>1402899229748</TIMESTAMP>
++      <TIMESTAMP>1410224798335</TIMESTAMP>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>493</MODE>
        </PERMISSION_STATUS>
@@@ -143,11 -135,11 +143,11 @@@
    <RECORD>
      <OPCODE>OP_CREATE_SNAPSHOT</OPCODE>
      <DATA>
 -      <TXID>12</TXID>
 +      <TXID>13</TXID>
        <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
        <SNAPSHOTNAME>snapshot1</SNAPSHOTNAME>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>16</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>14</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -157,18 -149,18 +157,18 @@@
        <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
        <SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
        <SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>17</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>15</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_DELETE_SNAPSHOT</OPCODE>
      <DATA>
 -      <TXID>14</TXID>
 +      <TXID>15</TXID>
        <SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
        <SNAPSHOTNAME>snapshot2</SNAPSHOTNAME>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>18</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>16</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -179,10 -194,31 +179,10 @@@
        <INODEID>16388</INODEID>
        <PATH>/file_create</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310284</MTIME>
-       <ATIME>1409943310284</ATIME>
 -      <MTIME>1402899229912</MTIME>
 -      <ATIME>1402899229912</ATIME>
++      <MTIME>1410224798359</MTIME>
++      <ATIME>1410224798359</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
        <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
@@@ -190,8 -226,8 +190,8 @@@
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>21</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>17</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -202,8 -238,8 +202,8 @@@
        <INODEID>0</INODEID>
        <PATH>/file_create</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310286</MTIME>
-       <ATIME>1409943310284</ATIME>
 -      <MTIME>1402899229931</MTIME>
 -      <ATIME>1402899229912</ATIME>
++      <MTIME>1410224798361</MTIME>
++      <ATIME>1410224798359</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -265,10 -301,10 +265,10 @@@
        <LENGTH>0</LENGTH>
        <SRC>/file_create</SRC>
        <DST>/file_moved</DST>
-       <TIMESTAMP>1409943310302</TIMESTAMP>
 -      <TIMESTAMP>1402899229963</TIMESTAMP>
++      <TIMESTAMP>1410224798379</TIMESTAMP>
        <OPTIONS>NONE</OPTIONS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>26</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>24</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -279,19 -315,19 +279,19 @@@
        <INODEID>16389</INODEID>
        <PATH>/file_concat_target</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310306</MTIME>
-       <ATIME>1409943310306</ATIME>
 -      <MTIME>1402899229981</MTIME>
 -      <ATIME>1402899229981</ATIME>
++      <MTIME>1410224798382</MTIME>
++      <ATIME>1410224798382</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
 -      <OVERWRITE>false</OVERWRITE>
 +      <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>28</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>26</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -396,8 -432,8 +396,8 @@@
        <INODEID>0</INODEID>
        <PATH>/file_concat_target</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310402</MTIME>
-       <ATIME>1409943310306</ATIME>
 -      <MTIME>1402899230219</MTIME>
 -      <ATIME>1402899229981</ATIME>
++      <MTIME>1410224798476</MTIME>
++      <ATIME>1410224798382</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -432,19 -468,19 +432,19 @@@
        <INODEID>16390</INODEID>
        <PATH>/file_concat_0</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310407</MTIME>
-       <ATIME>1409943310407</ATIME>
 -      <MTIME>1402899230235</MTIME>
 -      <ATIME>1402899230235</ATIME>
++      <MTIME>1410224798479</MTIME>
++      <ATIME>1410224798479</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
 -      <OVERWRITE>false</OVERWRITE>
 +      <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>41</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>39</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -549,8 -585,8 +549,8 @@@
        <INODEID>0</INODEID>
        <PATH>/file_concat_0</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310430</MTIME>
-       <ATIME>1409943310407</ATIME>
 -      <MTIME>1402899230307</MTIME>
 -      <ATIME>1402899230235</ATIME>
++      <MTIME>1410224798501</MTIME>
++      <ATIME>1410224798479</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -585,19 -621,19 +585,19 @@@
        <INODEID>16391</INODEID>
        <PATH>/file_concat_1</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310434</MTIME>
-       <ATIME>1409943310434</ATIME>
 -      <MTIME>1402899230320</MTIME>
 -      <ATIME>1402899230320</ATIME>
++      <MTIME>1410224798504</MTIME>
++      <ATIME>1410224798504</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
 -      <OVERWRITE>false</OVERWRITE>
 +      <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>53</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>51</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -702,8 -738,8 +702,8 @@@
        <INODEID>0</INODEID>
        <PATH>/file_concat_1</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310457</MTIME>
-       <ATIME>1409943310434</ATIME>
 -      <MTIME>1402899230383</MTIME>
 -      <ATIME>1402899230320</ATIME>
++      <MTIME>1410224798530</MTIME>
++      <ATIME>1410224798504</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -733,16 -769,16 +733,16 @@@
    <RECORD>
      <OPCODE>OP_CONCAT_DELETE</OPCODE>
      <DATA>
 -      <TXID>58</TXID>
 +      <TXID>57</TXID>
        <LENGTH>0</LENGTH>
        <TRG>/file_concat_target</TRG>
-       <TIMESTAMP>1409943310460</TIMESTAMP>
 -      <TIMESTAMP>1402899230394</TIMESTAMP>
++      <TIMESTAMP>1410224798533</TIMESTAMP>
        <SOURCES>
          <SOURCE1>/file_concat_0</SOURCE1>
          <SOURCE2>/file_concat_1</SOURCE2>
        </SOURCES>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>64</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>62</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -753,15 -789,15 +753,15 @@@
        <INODEID>16392</INODEID>
        <PATH>/file_symlink</PATH>
        <VALUE>/file_concat_target</VALUE>
-       <MTIME>1409943310463</MTIME>
-       <ATIME>1409943310463</ATIME>
 -      <MTIME>1402899230406</MTIME>
 -      <ATIME>1402899230406</ATIME>
++      <MTIME>1410224798537</MTIME>
++      <ATIME>1410224798537</ATIME>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>511</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>65</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>63</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -772,19 -808,19 +772,19 @@@
        <INODEID>16393</INODEID>
        <PATH>/hard-lease-recovery-test</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943310466</MTIME>
-       <ATIME>1409943310466</ATIME>
 -      <MTIME>1402899230413</MTIME>
 -      <ATIME>1402899230413</ATIME>
++      <MTIME>1410224798540</MTIME>
++      <ATIME>1410224798540</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
-       <CLIENT_NAME>DFSClient_NONMAPREDUCE_588677218_1</CLIENT_NAME>
 -      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1233039831_1</CLIENT_NAME>
++      <CLIENT_NAME>DFSClient_NONMAPREDUCE_1374813776_1</CLIENT_NAME>
        <CLIENT_MACHINE>127.0.0.1</CLIENT_MACHINE>
 -      <OVERWRITE>false</OVERWRITE>
 +      <OVERWRITE>true</OVERWRITE>
        <PERMISSION_STATUS>
 -        <USERNAME>andrew</USERNAME>
 +        <USERNAME>jing</USERNAME>
          <GROUPNAME>supergroup</GROUPNAME>
          <MODE>420</MODE>
        </PERMISSION_STATUS>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>66</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>64</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -839,8 -875,8 +839,8 @@@
    <RECORD>
      <OPCODE>OP_REASSIGN_LEASE</OPCODE>
      <DATA>
 -      <TXID>66</TXID>
 -      <LEASEHOLDER>DFSClient_NONMAPREDUCE_1233039831_1</LEASEHOLDER>
 +      <TXID>65</TXID>
-       <LEASEHOLDER>DFSClient_NONMAPREDUCE_588677218_1</LEASEHOLDER>
++      <LEASEHOLDER>DFSClient_NONMAPREDUCE_1374813776_1</LEASEHOLDER>
        <PATH>/hard-lease-recovery-test</PATH>
        <NEWHOLDER>HDFS_NameNode</NEWHOLDER>
      </DATA>
@@@ -853,8 -889,8 +853,8 @@@
        <INODEID>0</INODEID>
        <PATH>/hard-lease-recovery-test</PATH>
        <REPLICATION>1</REPLICATION>
-       <MTIME>1409943313176</MTIME>
-       <ATIME>1409943310466</ATIME>
 -      <MTIME>1402899232526</MTIME>
 -      <ATIME>1402899230413</ATIME>
++      <MTIME>1410224801265</MTIME>
++      <ATIME>1410224798540</ATIME>
        <BLOCKSIZE>512</BLOCKSIZE>
        <CLIENT_NAME></CLIENT_NAME>
        <CLIENT_MACHINE></CLIENT_MACHINE>
@@@ -881,18 -917,18 +881,18 @@@
        <MODE>493</MODE>
        <LIMIT>9223372036854775807</LIMIT>
        <MAXRELATIVEEXPIRY>2305843009213693951</MAXRELATIVEEXPIRY>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>73</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>71</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_MODIFY_CACHE_POOL</OPCODE>
      <DATA>
 -      <TXID>69</TXID>
 +      <TXID>68</TXID>
        <POOLNAME>pool1</POOLNAME>
        <LIMIT>99</LIMIT>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>74</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>72</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -903,37 -939,37 +903,37 @@@
        <PATH>/path</PATH>
        <REPLICATION>1</REPLICATION>
        <POOL>pool1</POOL>
-       <EXPIRATION>2305844419157007447</EXPIRATION>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <EXPIRATION>2305844412112927450</EXPIRATION>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>75</RPC_CALLID>
++      <EXPIRATION>2305844419438495525</EXPIRATION>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>73</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_MODIFY_CACHE_DIRECTIVE</OPCODE>
      <DATA>
 -      <TXID>71</TXID>
 +      <TXID>70</TXID>
        <ID>1</ID>
        <REPLICATION>2</REPLICATION>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>76</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>74</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_REMOVE_CACHE_DIRECTIVE</OPCODE>
      <DATA>
 -      <TXID>72</TXID>
 +      <TXID>71</TXID>
        <ID>1</ID>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>77</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>75</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_REMOVE_CACHE_POOL</OPCODE>
      <DATA>
 -      <TXID>73</TXID>
 +      <TXID>72</TXID>
        <POOLNAME>pool1</POOLNAME>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>78</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>76</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -979,8 -1015,8 +979,8 @@@
          <NAME>a1</NAME>
          <VALUE>0x313233</VALUE>
        </XATTR>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>80</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>78</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -993,8 -1029,8 +993,8 @@@
          <NAME>a2</NAME>
          <VALUE>0x373839</VALUE>
        </XATTR>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>81</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>79</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
@@@ -1006,22 -1042,22 +1006,22 @@@
          <NAMESPACE>USER</NAMESPACE>
          <NAME>a2</NAME>
        </XATTR>
-       <RPC_CLIENTID>e33c0cc9-12b1-49a2-80eb-4d35d3b79960</RPC_CLIENTID>
 -      <RPC_CLIENTID>e03f4a52-3d85-4e05-8942-286185e639bd</RPC_CLIENTID>
 -      <RPC_CALLID>82</RPC_CALLID>
++      <RPC_CLIENTID>b53e8d0a-8d92-4067-b8c8-637ac951bac2</RPC_CLIENTID>
 +      <RPC_CALLID>80</RPC_CALLID>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_ROLLING_UPGRADE_START</OPCODE>
      <DATA>
 -      <TXID>78</TXID>
 -      <STARTTIME>1402899233646</STARTTIME>
 +      <TXID>77</TXID>
-       <STARTTIME>1409943313537</STARTTIME>
++      <STARTTIME>1410224801616</STARTTIME>
      </DATA>
    </RECORD>
    <RECORD>
      <OPCODE>OP_ROLLING_UPGRADE_FINALIZE</OPCODE>
      <DATA>
 -      <TXID>79</TXID>
 -      <FINALIZETIME>1402899233647</FINALIZETIME>
 +      <TXID>78</TXID>
-       <FINALIZETIME>1409943313537</FINALIZETIME>
++      <FINALIZETIME>1410224801616</FINALIZETIME>
      </DATA>
    </RECORD>
    <RECORD>


Mime
View raw message