This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-2876 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit a7bc81ed113195a5c72871ad89cbb7308e307ac7 Author: Márton Elek <[email protected]> AuthorDate: Mon Feb 10 11:59:12 2020 +0100 fix merge conflicts --- .../apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java | 4 ++-- .../org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java index 5dd257c..f04a03c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java @@ -193,7 +193,7 @@ public class OMAllocateBlockRequest extends OMKeyRequest { bucketName, keyName); OmKeyInfo dbKeyInfo = omMetadataManager.getKeyTable().get(ozoneKey); if (dbKeyInfo != null) { - if (isReplay(ozoneManager, dbKeyInfo.getUpdateID(), trxnLogIndex)) { + if (isReplay(ozoneManager, dbKeyInfo, trxnLogIndex)) { // This transaction is a replay. Send replay response. throw new OMReplayException(); } @@ -205,7 +205,7 @@ public class OMAllocateBlockRequest extends OMKeyRequest { // Check if this transaction is a replay of ratis logs. // Check the updateID of the openKey to verify that it is not greater // than the current transactionLogIndex - if (isReplay(ozoneManager, openKeyInfo.getUpdateID(), trxnLogIndex)) { + if (isReplay(ozoneManager, openKeyInfo, trxnLogIndex)) { // This transaction is a replay. Send replay response. throw new OMReplayException(); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java index 3b50880..4a43709 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java @@ -95,7 +95,7 @@ public class OMKeyPurgeRequest extends OMKeyRequest { for (OmKeyInfo omKeyInfo : repeatedOmKeyInfo.getOmKeyInfoList()) { // Discard those keys whose updateID is > transactionLogIndex. // This could happen when the PurgeRequest is replayed. - if (isReplay(ozoneManager, omKeyInfo.getUpdateID(), + if (isReplay(ozoneManager, omKeyInfo, trxnLogIndex)) { purgeKey = false; result = Result.REPLAY; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
