Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2AF4317C03 for ; Wed, 1 Oct 2014 06:35:45 +0000 (UTC) Received: (qmail 26713 invoked by uid 500); 1 Oct 2014 06:35:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 26645 invoked by uid 500); 1 Oct 2014 06:35:44 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 26636 invoked by uid 99); 1 Oct 2014 06:35:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2014 06:35:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8C681A1DAEE; Wed, 1 Oct 2014 06:35:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Message-Id: <701825449c974ce4ad0d81342a17cc4f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) Date: Wed, 1 Oct 2014 06:35:44 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.6 a19efe3b1 -> 0abbfcf2d HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0abbfcf2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0abbfcf2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0abbfcf2 Branch: refs/heads/branch-2.6 Commit: 0abbfcf2d0acc86a792a2b4d91aa0b0d4d902cf9 Parents: a19efe3 Author: arp Authored: Tue Sep 30 18:10:13 2014 -0700 Committer: arp Committed: Tue Sep 30 23:34:11 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../hdfs/server/namenode/FSDirectory.java | 17 +- .../hadoop/hdfs/server/namenode/FSEditLog.java | 3 +- .../hdfs/server/namenode/FSEditLogLoader.java | 2 +- .../hdfs/server/namenode/FSEditLogOp.java | 16 ++ .../server/namenode/FSImageSerialization.java | 10 + .../hdfs/server/namenode/FSNamesystem.java | 2 +- .../hadoop-hdfs/src/test/resources/editsStored | Bin 4999 -> 5065 bytes .../src/test/resources/editsStored.xml | 212 +++++++++---------- 9 files changed, 152 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index af60660..d16f321 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -270,6 +270,9 @@ Release 2.6.0 - UNRELEASED HDFS-6779. Add missing version subcommand for hdfs. (Sasaki Toru via wheat9) + HDFS-7153. Add storagePolicy to NN edit log during file creation. + (Arpit Agarwal) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index 90271cb..083816e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -278,8 +278,16 @@ public class FSDirectory implements Closeable { private static INodeFile newINodeFile(long id, PermissionStatus permissions, long mtime, long atime, short replication, long preferredBlockSize) { + return newINodeFile(id, permissions, mtime, atime, replication, preferredBlockSize, + (byte)0); + } + + private static INodeFile newINodeFile(long id, PermissionStatus permissions, + long mtime, long atime, short replication, long preferredBlockSize, + byte storagePolicyId) { return new INodeFile(id, null, permissions, mtime, atime, - BlockInfo.EMPTY_ARRAY, replication, preferredBlockSize, (byte)0); + BlockInfo.EMPTY_ARRAY, replication, preferredBlockSize, + storagePolicyId); } /** @@ -329,17 +337,18 @@ public class FSDirectory implements Closeable { long preferredBlockSize, boolean underConstruction, String clientName, - String clientMachine) { + String clientMachine, + byte storagePolicyId) { final INodeFile newNode; assert hasWriteLock(); if (underConstruction) { newNode = newINodeFile(id, permissions, modificationTime, - modificationTime, replication, preferredBlockSize); + modificationTime, replication, preferredBlockSize, storagePolicyId); newNode.toUnderConstruction(clientName, clientMachine); } else { newNode = newINodeFile(id, permissions, modificationTime, atime, - replication, preferredBlockSize); + replication, preferredBlockSize, storagePolicyId); } try { http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java index 70a473f..cb44011 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java @@ -719,7 +719,8 @@ public class FSEditLog implements LogsPurgeable { .setClientName(newNode.getFileUnderConstructionFeature().getClientName()) .setClientMachine( newNode.getFileUnderConstructionFeature().getClientMachine()) - .setOverwrite(overwrite); + .setOverwrite(overwrite) + .setStoragePolicyId(newNode.getStoragePolicyID()); AclFeature f = newNode.getAclFeature(); if (f != null) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java index 7b240af..7dfe688 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java @@ -367,7 +367,7 @@ public class FSEditLogLoader { addCloseOp.xAttrs, replication, addCloseOp.mtime, addCloseOp.atime, addCloseOp.blockSize, true, addCloseOp.clientName, - addCloseOp.clientMachine); + addCloseOp.clientMachine, addCloseOp.storagePolicyId); fsNamesys.leaseManager.addLease(addCloseOp.clientName, path); // add the op into retry cache if necessary http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java index 07bba39..63983d7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java @@ -103,6 +103,7 @@ import org.apache.hadoop.hdfs.protocol.proto.AclProtos.AclEditLogProto; import org.apache.hadoop.hdfs.protocol.proto.XAttrProtos.XAttrEditLogProto; import org.apache.hadoop.hdfs.protocolPB.PBHelper; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier; +import org.apache.hadoop.hdfs.server.blockmanagement.BlockStoragePolicySuite; import org.apache.hadoop.hdfs.util.XMLUtils; import org.apache.hadoop.hdfs.util.XMLUtils.InvalidXmlException; import org.apache.hadoop.hdfs.util.XMLUtils.Stanza; @@ -412,6 +413,7 @@ public abstract class FSEditLogOp { String clientName; String clientMachine; boolean overwrite; + byte storagePolicyId; private AddCloseOp(FSEditLogOpCodes opCode) { super(opCode); @@ -497,6 +499,11 @@ public abstract class FSEditLogOp { return (T)this; } + T setStoragePolicyId(byte storagePolicyId) { + this.storagePolicyId = storagePolicyId; + return (T)this; + } + @Override public void writeFields(DataOutputStream out) throws IOException { FSImageSerialization.writeLong(inodeId, out); @@ -516,6 +523,7 @@ public abstract class FSEditLogOp { FSImageSerialization.writeString(clientName,out); FSImageSerialization.writeString(clientMachine,out); FSImageSerialization.writeBoolean(overwrite, out); + FSImageSerialization.writeByte(storagePolicyId, out); // write clientId and callId writeRpcIds(rpcClientId, rpcCallId, out); } @@ -587,6 +595,12 @@ public abstract class FSEditLogOp { } else { this.overwrite = false; } + if (NameNodeLayoutVersion.supports( + NameNodeLayoutVersion.Feature.BLOCK_STORAGE_POLICY, logVersion)) { + this.storagePolicyId = FSImageSerialization.readByte(in); + } else { + this.storagePolicyId = BlockStoragePolicySuite.ID_UNSPECIFIED; + } // read clientId and callId readRpcIds(in, logVersion); } else { @@ -647,6 +661,8 @@ public abstract class FSEditLogOp { if (this.opCode == OP_ADD) { appendRpcIdsToString(builder, rpcClientId, rpcCallId); } + builder.append(", storagePolicyId="); + builder.append(storagePolicyId); builder.append(", opCode="); builder.append(opCode); builder.append(", txid="); http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java index be70f4b..d3472fc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java @@ -383,6 +383,12 @@ public class FSImageSerialization { uBoolean.write(out); } + /** write the byte value */ + static void writeByte(byte value, DataOutputStream out) + throws IOException { + out.write(value); + } + /** read the int value */ static int readInt(DataInput in) throws IOException { IntWritable uInt = TL_DATA.get().U_INT; @@ -422,6 +428,10 @@ public class FSImageSerialization { return bytes; } + public static byte readByte(DataInput in) throws IOException { + return in.readByte(); + } + /** * Reading the path from the image and converting it to byte[][] directly * this saves us an array copy and conversions to and from String http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 1dd1352..07c4998 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2580,7 +2580,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats, clientMachine, create, overwrite, createParent, replication, blockSize, suite, protocolVersion, edek, logRetryCache); stat = dir.getFileInfo(src, false, - FSDirectory.isReservedRawName(srcArg), false); + FSDirectory.isReservedRawName(srcArg), true); } catch (StandbyException se) { skipSync = true; throw se; http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored index ecfbb9f..08607eb 100644 Binary files a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored and b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/0abbfcf2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml index 8cafa9f..5e1d718 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml @@ -13,8 +13,8 @@ 2 1 - 1410915997709 - 309e81e09dc6c75a + 1412805665311 + c1cad1109e33ae77 @@ -24,8 +24,8 @@ 3 2 - 1410915997711 - 8a2399843e754bee + 1412805665314 + 0632068587d6574c @@ -37,19 +37,19 @@ 16386 /file_create 1 - 1410224798292 - 1410224798292 + 1412114467969 + 1412114467969 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 5 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 13 @@ -60,14 +60,14 @@ 0 /file_create 1 - 1410224798315 - 1410224798292 + 1412114468019 + 1412114467969 512 false - jing + aagarwal supergroup 420 @@ -88,9 +88,9 @@ 0 /file_create /file_moved - 1410224798322 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 8 + 1412114468027 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 16 @@ -99,9 +99,9 @@ 8 0 /file_moved - 1410224798328 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 9 + 1412114468034 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 17 @@ -111,9 +111,9 @@ 0 16387 /directory_mkdir - 1410224798335 + 1412114468041 - jing + aagarwal supergroup 493 @@ -146,8 +146,8 @@ 13 /directory_mkdir snapshot1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 14 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 22 @@ -157,8 +157,8 @@ /directory_mkdir snapshot1 snapshot2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 15 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 23 @@ -167,8 +167,8 @@ 15 /directory_mkdir snapshot2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 16 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 24 @@ -179,19 +179,19 @@ 16388 /file_create 1 - 1410224798359 - 1410224798359 + 1412114468073 + 1412114468073 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 17 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 25 @@ -202,14 +202,14 @@ 0 /file_create 1 - 1410224798361 - 1410224798359 + 1412114468075 + 1412114468073 512 false - jing + aagarwal supergroup 420 @@ -265,10 +265,10 @@ 0 /file_create /file_moved - 1410224798379 + 1412114468093 NONE - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 24 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 32 @@ -279,19 +279,19 @@ 16389 /file_concat_target 1 - 1410224798382 - 1410224798382 + 1412114468097 + 1412114468097 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 26 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 34 @@ -396,8 +396,8 @@ 0 /file_concat_target 1 - 1410224798476 - 1410224798382 + 1412114468349 + 1412114468097 512 @@ -418,7 +418,7 @@ 1003 - jing + aagarwal supergroup 420 @@ -432,19 +432,19 @@ 16390 /file_concat_0 1 - 1410224798479 - 1410224798479 + 1412114468351 + 1412114468351 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 39 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 47 @@ -549,8 +549,8 @@ 0 /file_concat_0 1 - 1410224798501 - 1410224798479 + 1412114468370 + 1412114468351 512 @@ -571,7 +571,7 @@ 1006 - jing + aagarwal supergroup 420 @@ -585,19 +585,19 @@ 16391 /file_concat_1 1 - 1410224798504 - 1410224798504 + 1412114468373 + 1412114468373 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 51 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 59 @@ -702,8 +702,8 @@ 0 /file_concat_1 1 - 1410224798530 - 1410224798504 + 1412114468392 + 1412114468373 512 @@ -724,7 +724,7 @@ 1009 - jing + aagarwal supergroup 420 @@ -736,13 +736,13 @@ 57 0 /file_concat_target - 1410224798533 + 1412114468395 /file_concat_0 /file_concat_1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 62 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 70 @@ -753,15 +753,15 @@ 16392 /file_symlink /file_concat_target - 1410224798537 - 1410224798537 + 1412114468398 + 1412114468398 - jing + aagarwal supergroup 511 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 63 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 71 @@ -772,19 +772,19 @@ 16393 /hard-lease-recovery-test 1 - 1410224798540 - 1410224798540 + 1412114468401 + 1412114468401 512 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 127.0.0.1 true - jing + aagarwal supergroup 420 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 64 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 72 @@ -840,7 +840,7 @@ OP_REASSIGN_LEASE 65 - DFSClient_NONMAPREDUCE_1374813776_1 + DFSClient_NONMAPREDUCE_1474796918_1 /hard-lease-recovery-test HDFS_NameNode @@ -853,8 +853,8 @@ 0 /hard-lease-recovery-test 1 - 1410224801265 - 1410224798540 + 1412114470807 + 1412114468401 512 @@ -865,7 +865,7 @@ 1011 - jing + aagarwal supergroup 420 @@ -876,13 +876,13 @@ 67 pool1 - jing + aagarwal staff 493 9223372036854775807 2305843009213693951 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 71 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 79 @@ -891,8 +891,8 @@ 68 pool1 99 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 72 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 80 @@ -903,9 +903,9 @@ /path 1 pool1 - 2305844419438495525 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 73 + 2305844421328165416 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 81 @@ -914,8 +914,8 @@ 70 1 2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 74 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 82 @@ -923,8 +923,8 @@ 71 1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 75 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 83 @@ -932,8 +932,8 @@ 72 pool1 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 76 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 84 @@ -979,8 +979,8 @@ a1 0x313233 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 78 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 86 @@ -993,8 +993,8 @@ a2 0x373839 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 79 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 87 @@ -1006,22 +1006,22 @@ USER a2 - b53e8d0a-8d92-4067-b8c8-637ac951bac2 - 80 + 0a28b871-f75a-46a4-80e0-fe41cbb6b034 + 88 OP_ROLLING_UPGRADE_START 77 - 1410224801616 + 1412114471510 OP_ROLLING_UPGRADE_FINALIZE 78 - 1410224801616 + 1412114471510