This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new bd9f24d0e9 HDDS-10006. Pass TransactionInfo in
OzoneManagerRequestHandler.handleWriteRequest. (#5860)
bd9f24d0e9 is described below
commit bd9f24d0e9fb0039377fb42ce53aed9db5ac5b0a
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Thu Dec 28 00:22:27 2023 -0800
HDDS-10006. Pass TransactionInfo in
OzoneManagerRequestHandler.handleWriteRequest. (#5860)
---
.../apache/hadoop/hdds/utils/TransactionInfo.java | 7 +++
.../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 52 +++++++---------------
.../ozone/om/ratis/OzoneManagerStateMachine.java | 27 ++++-------
.../ozone/om/ratis/helpers/DoubleBufferEntry.java | 11 ++---
.../hadoop/ozone/om/request/OMClientRequest.java | 11 ++++-
.../om/request/bucket/OMBucketCreateRequest.java | 5 ++-
.../om/request/bucket/OMBucketDeleteRequest.java | 5 ++-
.../om/request/bucket/OMBucketSetOwnerRequest.java | 5 ++-
.../request/bucket/OMBucketSetPropertyRequest.java | 5 ++-
.../om/request/bucket/acl/OMBucketAclRequest.java | 5 ++-
.../request/bucket/acl/OMBucketAddAclRequest.java | 6 +--
.../bucket/acl/OMBucketRemoveAclRequest.java | 6 +--
.../request/bucket/acl/OMBucketSetAclRequest.java | 6 +--
.../om/request/file/OMDirectoryCreateRequest.java | 5 ++-
.../file/OMDirectoryCreateRequestWithFSO.java | 5 ++-
.../ozone/om/request/file/OMFileCreateRequest.java | 5 ++-
.../request/file/OMFileCreateRequestWithFSO.java | 5 ++-
.../om/request/file/OMRecoverLeaseRequest.java | 6 +--
.../om/request/key/OMAllocateBlockRequest.java | 5 ++-
.../request/key/OMAllocateBlockRequestWithFSO.java | 5 ++-
.../key/OMDirectoriesPurgeRequestWithFSO.java | 4 +-
.../ozone/om/request/key/OMKeyCommitRequest.java | 5 ++-
.../om/request/key/OMKeyCommitRequestWithFSO.java | 5 ++-
.../ozone/om/request/key/OMKeyCreateRequest.java | 5 ++-
.../om/request/key/OMKeyCreateRequestWithFSO.java | 5 ++-
.../ozone/om/request/key/OMKeyDeleteRequest.java | 5 ++-
.../om/request/key/OMKeyDeleteRequestWithFSO.java | 5 ++-
.../ozone/om/request/key/OMKeyPurgeRequest.java | 4 +-
.../ozone/om/request/key/OMKeyRenameRequest.java | 5 ++-
.../om/request/key/OMKeyRenameRequestWithFSO.java | 5 ++-
.../ozone/om/request/key/OMKeySetTimesRequest.java | 5 ++-
.../request/key/OMKeySetTimesRequestWithFSO.java | 5 ++-
.../ozone/om/request/key/OMKeysDeleteRequest.java | 5 ++-
.../ozone/om/request/key/OMKeysRenameRequest.java | 5 ++-
.../om/request/key/OMOpenKeysDeleteRequest.java | 5 ++-
.../om/request/key/OmKeysDeleteRequestWithFSO.java | 11 -----
.../ozone/om/request/key/acl/OMKeyAclRequest.java | 5 ++-
.../om/request/key/acl/OMKeyAclRequestWithFSO.java | 5 ++-
.../om/request/key/acl/OMKeyAddAclRequest.java | 6 +--
.../request/key/acl/OMKeyAddAclRequestWithFSO.java | 6 +--
.../om/request/key/acl/OMKeyRemoveAclRequest.java | 6 +--
.../key/acl/OMKeyRemoveAclRequestWithFSO.java | 6 +--
.../om/request/key/acl/OMKeySetAclRequest.java | 6 +--
.../request/key/acl/OMKeySetAclRequestWithFSO.java | 6 +--
.../request/key/acl/prefix/OMPrefixAclRequest.java | 5 ++-
.../S3ExpiredMultipartUploadsAbortRequest.java | 5 ++-
.../S3InitiateMultipartUploadRequest.java | 5 ++-
.../S3InitiateMultipartUploadRequestWithFSO.java | 5 ++-
.../multipart/S3MultipartUploadAbortRequest.java | 5 ++-
.../S3MultipartUploadCommitPartRequest.java | 5 ++-
.../S3MultipartUploadCompleteRequest.java | 5 ++-
.../om/request/s3/security/OMSetSecretRequest.java | 6 +--
.../om/request/s3/security/S3GetSecretRequest.java | 6 +--
.../request/s3/security/S3RevokeSecretRequest.java | 4 +-
.../tenant/OMSetRangerServiceVersionRequest.java | 6 +--
.../s3/tenant/OMTenantAssignAdminRequest.java | 6 +--
.../tenant/OMTenantAssignUserAccessIdRequest.java | 6 +--
.../request/s3/tenant/OMTenantCreateRequest.java | 5 ++-
.../request/s3/tenant/OMTenantDeleteRequest.java | 5 ++-
.../s3/tenant/OMTenantRevokeAdminRequest.java | 6 +--
.../tenant/OMTenantRevokeUserAccessIdRequest.java | 5 ++-
.../security/OMCancelDelegationTokenRequest.java | 5 ++-
.../security/OMGetDelegationTokenRequest.java | 6 +--
.../security/OMRenewDelegationTokenRequest.java | 6 +--
.../request/snapshot/OMSnapshotCreateRequest.java | 7 ++-
.../request/snapshot/OMSnapshotDeleteRequest.java | 6 +--
.../snapshot/OMSnapshotMoveDeletedKeysRequest.java | 4 +-
.../request/snapshot/OMSnapshotPurgeRequest.java | 5 ++-
.../snapshot/OMSnapshotSetPropertyRequest.java | 6 +--
.../om/request/upgrade/OMCancelPrepareRequest.java | 12 +++--
.../request/upgrade/OMFinalizeUpgradeRequest.java | 6 +--
.../ozone/om/request/upgrade/OMPrepareRequest.java | 10 ++---
.../om/request/util/OMEchoRPCWriteRequest.java | 4 +-
.../om/request/volume/OMVolumeCreateRequest.java | 5 ++-
.../om/request/volume/OMVolumeDeleteRequest.java | 5 ++-
.../om/request/volume/OMVolumeSetOwnerRequest.java | 5 ++-
.../om/request/volume/OMVolumeSetQuotaRequest.java | 5 ++-
.../om/request/volume/acl/OMVolumeAclRequest.java | 5 ++-
.../request/volume/acl/OMVolumeAddAclRequest.java | 6 +--
.../volume/acl/OMVolumeRemoveAclRequest.java | 6 +--
.../request/volume/acl/OMVolumeSetAclRequest.java | 6 +--
...OzoneManagerProtocolServerSideTranslatorPB.java | 3 +-
.../protocolPB/OzoneManagerRequestHandler.java | 8 ++--
.../hadoop/ozone/protocolPB/RequestHandler.java | 7 +--
.../om/ratis/TestOzoneManagerDoubleBuffer.java | 8 ++--
...tOzoneManagerDoubleBufferWithDummyResponse.java | 4 +-
...TestOzoneManagerDoubleBufferWithOMResponse.java | 20 ++++-----
87 files changed, 298 insertions(+), 279 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
index 57ee74e026..75329c0c17 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
@@ -81,6 +81,13 @@ public final class TransactionInfo implements
Comparable<TransactionInfo> {
public static final TransactionInfo DEFAULT_VALUE = valueOf(0, -1);
+ /** In non-Ratis clusters, term is -1. */
+ public static final long NON_RATIS_TERM = -1;
+ /** For non-Ratis case. */
+ public static TermIndex getTermIndex(long transactionIndex) {
+ return TermIndex.valueOf(NON_RATIS_TERM, transactionIndex);
+ }
+
/**
* Use {@link SnapshotInfo} to store (term, index)
* which is the Ratis Log term-index in Ratis enabled cluster.
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
index c072176d11..678fa492ef 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
@@ -38,7 +38,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.hdds.utils.TransactionInfo;
@@ -54,6 +53,7 @@ import org.apache.hadoop.ozone.om.response.OMClientResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.Time;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.function.CheckedRunnable;
import org.slf4j.Logger;
@@ -113,11 +113,6 @@ public final class OzoneManagerDoubleBuffer {
private final String threadPrefix;
private final S3SecretManager s3SecretManager;
- /**
- * function which will get term associated with the transaction index.
- */
- private final Function<Long, Long> indexToTerm;
-
/**
* Builder for creating OzoneManagerDoubleBuffer.
*/
@@ -126,7 +121,6 @@ public final class OzoneManagerDoubleBuffer {
private OzoneManagerRatisSnapshot rs;
private boolean isRatisEnabled = false;
private boolean isTracingEnabled = false;
- private Function<Long, Long> indexToTerm = null;
private int maxUnFlushedTransactionCount = 0;
private FlushNotifier flushNotifier;
private S3SecretManager s3SecretManager;
@@ -154,11 +148,6 @@ public final class OzoneManagerDoubleBuffer {
return this;
}
- public Builder setIndexToTerm(Function<Long, Long> termGet) {
- this.indexToTerm = termGet;
- return this;
- }
-
public Builder setmaxUnFlushedTransactionCount(int size) {
this.maxUnFlushedTransactionCount = size;
return this;
@@ -183,8 +172,6 @@ public final class OzoneManagerDoubleBuffer {
if (isRatisEnabled) {
Preconditions.checkNotNull(rs, "When ratis is enabled, " +
"OzoneManagerRatisSnapshot should not be null");
- Preconditions.checkNotNull(indexToTerm, "When ratis is enabled " +
- "indexToTerm should not be null");
Preconditions.checkState(maxUnFlushedTransactionCount > 0L,
"when ratis is enable, maxUnFlushedTransactions " +
"should be bigger than 0");
@@ -194,7 +181,7 @@ public final class OzoneManagerDoubleBuffer {
}
return new OzoneManagerDoubleBuffer(mm, rs, isRatisEnabled,
- isTracingEnabled, indexToTerm, maxUnFlushedTransactionCount,
+ isTracingEnabled, maxUnFlushedTransactionCount,
flushNotifier, s3SecretManager, threadPrefix);
}
}
@@ -203,7 +190,7 @@ public final class OzoneManagerDoubleBuffer {
private OzoneManagerDoubleBuffer(OMMetadataManager omMetadataManager,
OzoneManagerRatisSnapshot ozoneManagerRatisSnapShot,
boolean isRatisEnabled, boolean isTracingEnabled,
- Function<Long, Long> indexToTerm, int maxUnFlushedTransactions,
+ int maxUnFlushedTransactions,
FlushNotifier flushNotifier, S3SecretManager s3SecretManager,
String threadPrefix) {
this.currentBuffer = new ConcurrentLinkedQueue<>();
@@ -219,7 +206,6 @@ public final class OzoneManagerDoubleBuffer {
this.ozoneManagerRatisSnapShot = ozoneManagerRatisSnapShot;
this.ozoneManagerDoubleBufferMetrics =
OzoneManagerDoubleBufferMetrics.create();
- this.indexToTerm = indexToTerm;
this.flushNotifier = flushNotifier;
this.threadPrefix = threadPrefix;
isRunning.set(true);
@@ -347,7 +333,14 @@ public final class OzoneManagerDoubleBuffer {
throws IOException {
Map<String, List<Long>> cleanupEpochs = new HashMap<>();
- List<Long> flushedEpochs;
+ // Commit transaction info to DB.
+ final List<TermIndex> flushedTransactions = buffer.stream()
+ .map(DoubleBufferEntry::getTermIndex)
+ .sorted()
+ .collect(Collectors.toList());
+ final List<Long> flushedEpochs = flushedTransactions.stream()
+ .map(TermIndex::getIndex)
+ .collect(Collectors.toList());
try (BatchOperation batchOperation = omMetadataManager.getStore()
.initBatchOperation()) {
@@ -357,22 +350,12 @@ public final class OzoneManagerDoubleBuffer {
buffer.iterator().forEachRemaining(
entry -> addCleanupEntry(entry, cleanupEpochs));
- // Commit transaction info to DB.
- flushedEpochs = buffer.stream()
- .map(DoubleBufferEntry::getTrxLogIndex)
- .sorted()
- .collect(Collectors.toList());
-
- long lastRatisTransactionIndex = flushedEpochs.get(
- flushedEpochs.size() - 1);
-
- long term = isRatisEnabled ?
- indexToTerm.apply(lastRatisTransactionIndex) : -1;
+ final TermIndex lastTransaction =
flushedTransactions.get(flushedTransactions.size() - 1);
addToBatchTransactionInfoWithTrace(lastTraceId,
- lastRatisTransactionIndex,
+ lastTransaction.getIndex(),
() -> omMetadataManager.getTransactionInfoTable().putWithBatch(
- batchOperation, TRANSACTION_INFO_KEY,
TransactionInfo.valueOf(term, lastRatisTransactionIndex)));
+ batchOperation, TRANSACTION_INFO_KEY,
TransactionInfo.valueOf(lastTransaction)));
long startTime = Time.monotonicNow();
flushBatchWithTrace(lastTraceId, buffer.size(),
@@ -499,7 +482,7 @@ public final class OzoneManagerDoubleBuffer {
}
for (String table : cleanupTables) {
cleanupEpochs.computeIfAbsent(table, list -> new ArrayList<>())
- .add(entry.getTrxLogIndex());
+ .add(entry.getTermIndex().getIndex());
}
} else {
// This is to catch early errors, when a new response class missed to
@@ -614,9 +597,8 @@ public final class OzoneManagerDoubleBuffer {
/**
* Add OmResponseBufferEntry to buffer.
*/
- public synchronized CompletableFuture<Void> add(OMClientResponse response,
- long transactionIndex) {
- currentBuffer.add(new DoubleBufferEntry<>(transactionIndex, response));
+ public synchronized CompletableFuture<Void> add(OMClientResponse response,
TermIndex termIndex) {
+ currentBuffer.add(new DoubleBufferEntry<>(termIndex, response));
notify();
if (!isRatisEnabled) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
index 5a9faa301e..ee01ecedb8 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
@@ -330,7 +330,8 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
final OMRequest request = context != null ? (OMRequest) context
: OMRatisHelper.convertByteStringToOMRequest(
trx.getStateMachineLogEntry().getLogData());
- long trxLogIndex = trx.getLogEntry().getIndex();
+ final TermIndex termIndex = TermIndex.valueOf(trx.getLogEntry());
+ final long trxLogIndex = termIndex.getIndex();
// In the current approach we have one single global thread executor.
// with single thread. Right now this is being done for correctness, as
// applyTransaction will be run on multiple OM's we want to execute the
@@ -370,7 +371,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
ozoneManagerDoubleBuffer.acquireUnFlushedTransactions(1);
CompletableFuture<OMResponse> future = CompletableFuture.supplyAsync(
- () -> runCommand(request, trxLogIndex), executorService);
+ () -> runCommand(request, termIndex), executorService);
future.thenApply(omResponse -> {
if (!omResponse.getSuccess()) {
// When INTERNAL_ERROR or METADATA_ERROR it is considered as
@@ -475,7 +476,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
.setOmMetadataManager(ozoneManager.getMetadataManager())
.setOzoneManagerRatisSnapShot(this::updateLastAppliedIndex)
.setmaxUnFlushedTransactionCount(maxUnflushedTransactionSize)
- .setIndexToTerm(this::getTermForIndex).setThreadPrefix(threadPrefix)
+ .setThreadPrefix(threadPrefix)
.setS3SecretManager(ozoneManager.getS3SecretManager())
.enableRatis(true)
.enableTracing(isTracingEnabled)
@@ -575,10 +576,9 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
* @return response from OM
* @throws ServiceException
*/
- private OMResponse runCommand(OMRequest request, long trxLogIndex) {
+ private OMResponse runCommand(OMRequest request, TermIndex termIndex) {
try {
- OMClientResponse omClientResponse =
- handler.handleWriteRequest(request, trxLogIndex);
+ OMClientResponse omClientResponse = handler.handleWriteRequest(request,
termIndex);
OMLockDetails omLockDetails = omClientResponse.getOmLockDetails();
OMResponse omResponse = omClientResponse.getOMResponse();
if (omLockDetails != null) {
@@ -589,7 +589,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
}
} catch (IOException e) {
LOG.warn("Failed to write, Exception occurred ", e);
- return createErrorResponse(request, e, trxLogIndex);
+ return createErrorResponse(request, e, termIndex);
} catch (Throwable e) {
// For any Runtime exceptions, terminate OM.
String errorMessage = "Request " + request + " failed with exception";
@@ -599,7 +599,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
}
private OMResponse createErrorResponse(
- OMRequest omRequest, IOException exception, long trxIndex) {
+ OMRequest omRequest, IOException exception, TermIndex termIndex) {
OMResponse.Builder omResponseBuilder = OMResponse.newBuilder()
.setStatus(OzoneManagerRatisUtils.exceptionToResponseStatus(exception))
.setCmdType(omRequest.getCmdType())
@@ -611,7 +611,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
OMResponse omResponse = omResponseBuilder.build();
OMClientResponse omClientResponse = new DummyOMClientResponse(omResponse);
omClientResponse.setFlushFuture(
- ozoneManagerDoubleBuffer.add(omClientResponse, trxIndex));
+ ozoneManagerDoubleBuffer.add(omClientResponse, termIndex));
return omResponse;
}
@@ -775,15 +775,6 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
applyTransactionMap.put(index, term);
}
- /**
- * Return term associated with transaction index.
- * @param transactionIndex
- * @return
- */
- public long getTermForIndex(long transactionIndex) {
- return applyTransactionMap.get(transactionIndex);
- }
-
/**
* Wait until both buffers are flushed. This is used in cases like
* "follower bootstrap tarball creation" where the rocksDb for the active
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/helpers/DoubleBufferEntry.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/helpers/DoubleBufferEntry.java
index cd4c5ae8b2..f1b06d7f97 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/helpers/DoubleBufferEntry.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/helpers/DoubleBufferEntry.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.ratis.helpers;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.ratis.server.protocol.TermIndex;
/**
* Entry in OzoneManagerDouble Buffer.
@@ -26,16 +27,16 @@ import org.apache.hadoop.ozone.om.response.OMClientResponse;
*/
public class DoubleBufferEntry<Response extends OMClientResponse> {
- private long trxLogIndex;
+ private final TermIndex termIndex;
private Response response;
- public DoubleBufferEntry(long trxLogIndex, Response response) {
- this.trxLogIndex = trxLogIndex;
+ public DoubleBufferEntry(TermIndex termIndex, Response response) {
+ this.termIndex = termIndex;
this.response = response;
}
- public long getTrxLogIndex() {
- return trxLogIndex;
+ public TermIndex getTermIndex() {
+ return termIndex;
}
public Response getResponse() {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
index 1d897b89aa..3483856bdd 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
@@ -21,6 +21,8 @@ package org.apache.hadoop.ozone.om.request;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.hdds.utils.TransactionInfo;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -135,8 +137,13 @@ public abstract class OMClientRequest implements
RequestAuditor {
*
* @return the response that will be returned to the client.
*/
- public abstract OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex);
+ public abstract OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, TermIndex termIndex);
+
+ /** For testing only. */
+ @VisibleForTesting
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long transactionLogIndex) {
+ return validateAndUpdateCache(ozoneManager,
TransactionInfo.getTermIndex(transactionLogIndex));
+ }
@VisibleForTesting
public OMRequest getOmRequest() {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
index 3dea33f4bc..de8152af46 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.crypto.key.KeyProvider;
import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.ClientVersion;
@@ -162,8 +163,8 @@ public class OMBucketCreateRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumBucketCreates();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
index 85b5771108..48a3c807b9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
@@ -23,6 +23,7 @@ import java.nio.file.InvalidPathException;
import java.util.Iterator;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
@@ -80,8 +81,8 @@ public class OMBucketDeleteRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumBucketDeletes();
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetOwnerRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetOwnerRequest.java
index 11d2458d36..e135b7a252 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetOwnerRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetOwnerRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.bucket;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -76,8 +77,8 @@ public class OMBucketSetOwnerRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
SetBucketPropertyRequest setBucketPropertyRequest =
getOmRequest().getSetBucketPropertyRequest();
Preconditions.checkNotNull(setBucketPropertyRequest);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
index e0f8736983..821c374c2d 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
@@ -24,6 +24,7 @@ import java.util.List;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -94,8 +95,8 @@ public class OMBucketSetPropertyRequest extends
OMClientRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
SetBucketPropertyRequest setBucketPropertyRequest =
getOmRequest().getSetBucketPropertyRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java
index 8958210d44..89d9dbf5df 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.function.BiPredicate;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -62,8 +63,8 @@ public abstract class OMBucketAclRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
// protobuf guarantees acls are non-null.
List<OzoneAcl> ozoneAcls = getAcls();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java
index 28acc4596c..07903f2e36 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -132,10 +133,9 @@ public class OMBucketAddAclRequest extends
OMBucketAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumAddAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java
index 29203f6fa1..392b3e2803 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -131,10 +132,9 @@ public class OMBucketRemoveAclRequest extends
OMBucketAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumRemoveAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
index dab67f9ea5..3e41126313 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -130,10 +131,9 @@ public class OMBucketSetAclRequest extends
OMBucketAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumSetAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
index 6c7ee06e8b..4554092a61 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -31,6 +31,7 @@ import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
@@ -132,8 +133,8 @@ public class OMDirectoryCreateRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CreateDirectoryRequest createDirectoryRequest = getOmRequest()
.getCreateDirectoryRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
index 65b511cfc0..e62666e27b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.file;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -79,8 +80,8 @@ public class OMDirectoryCreateRequestWithFSO extends
OMDirectoryCreateRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CreateDirectoryRequest createDirectoryRequest = getOmRequest()
.getCreateDirectoryRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
index 1e6cc944fe..32dbe986b7 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMConfigKeys;
@@ -165,8 +166,8 @@ public class OMFileCreateRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CreateFileRequest createFileRequest =
getOmRequest().getCreateFileRequest();
KeyArgs keyArgs = createFileRequest.getKeyArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
index 20c4f8991b..474433a2f0 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.file;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -69,8 +70,8 @@ public class OMFileCreateRequestWithFSO extends
OMFileCreateRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CreateFileRequest createFileRequest =
getOmRequest().getCreateFileRequest();
KeyArgs keyArgs = createFileRequest.getKeyArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java
index cf24c26f5b..3d23ee0832 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.request.file;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -103,8 +104,7 @@ public class OMRecoverLeaseRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
RecoverLeaseRequest recoverLeaseRequest = getOmRequest()
.getRecoverLeaseRequest();
Preconditions.checkNotNull(recoverLeaseRequest);
@@ -136,7 +136,7 @@ public class OMRecoverLeaseRequest extends OMKeyRequest {
acquiredLock = getOmLockDetails().isLockAcquired();
validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
- String openKeyEntryName = doWork(ozoneManager, transactionLogIndex);
+ String openKeyEntryName = doWork(ozoneManager, termIndex.getIndex());
// Prepare response
boolean responseCode = true;
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 321b9b9a27..fc9b7da93b 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
@@ -26,6 +26,7 @@ import java.util.Map;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
@@ -145,8 +146,8 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OzoneManagerProtocolProtos.AllocateBlockRequest allocateBlockRequest =
getOmRequest().getAllocateBlockRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
index 4053637ed9..3f3b386d1a 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.request.key;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -71,8 +72,8 @@ public class OMAllocateBlockRequestWithFSO extends
OMAllocateBlockRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
AllocateBlockRequest allocateBlockRequest =
getOmRequest().getAllocateBlockRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
index 474a100f9e..52bcf366c9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
@@ -51,8 +52,7 @@ public class OMDirectoriesPurgeRequestWithFSO extends
OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OzoneManagerProtocolProtos.PurgeDirectoriesRequest purgeDirsRequest =
getOmRequest().getPurgeDirectoriesRequest();
String fromSnapshot = purgeDirsRequest.hasSnapshotTableKey() ?
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index 074f137a7a..863bc9af38 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -28,6 +28,7 @@ import java.util.Map;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -126,8 +127,8 @@ public class OMKeyCommitRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CommitKeyRequest commitKeyRequest = getOmRequest().getCommitKeyRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
index ede425aa84..cf86e1e8a4 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
@@ -22,6 +22,7 @@ import java.nio.file.InvalidPathException;
import java.util.HashMap;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -72,8 +73,8 @@ public class OMKeyCommitRequestWithFSO extends
OMKeyCommitRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CommitKeyRequest commitKeyRequest = getOmRequest().getCommitKeyRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
index fbaf987ebc..4b5f5a8330 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneConfigUtil;
@@ -184,8 +185,8 @@ public class OMKeyCreateRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
CreateKeyRequest createKeyRequest = getOmRequest().getCreateKeyRequest();
KeyArgs keyArgs = createKeyRequest.getKeyArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index ab3c561744..2a609af446 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.key;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -69,8 +70,8 @@ public class OMKeyCreateRequestWithFSO extends
OMKeyCreateRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OzoneManagerProtocolProtos.CreateKeyRequest createKeyRequest =
getOmRequest().getCreateKeyRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java
index 0998d00175..fa51a125a5 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.InvalidPathException;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
@@ -94,8 +95,8 @@ public class OMKeyDeleteRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
DeleteKeyRequest deleteKeyRequest = getOmRequest().getDeleteKeyRequest();
OzoneManagerProtocolProtos.KeyArgs keyArgs = deleteKeyRequest.getKeyArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
index d746a7bc26..28568d96f6 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -67,8 +68,8 @@ public class OMKeyDeleteRequestWithFSO extends
OMKeyDeleteRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
DeleteKeyRequest deleteKeyRequest = getOmRequest().getDeleteKeyRequest();
OzoneManagerProtocolProtos.KeyArgs keyArgs =
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 778f526d67..9ed9218396 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
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.request.key;
import java.io.IOException;
import java.util.ArrayList;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
@@ -50,8 +51,7 @@ public class OMKeyPurgeRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
PurgeKeysRequest purgeKeysRequest = getOmRequest().getPurgeKeysRequest();
List<DeletedKeys> bucketDeletedKeysList = purgeKeysRequest
.getDeletedKeysList();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
index 7ae37d261e..2d21354350 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -23,6 +23,7 @@ import java.nio.file.InvalidPathException;
import java.util.Map;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMConfigKeys;
@@ -109,8 +110,8 @@ public class OMKeyRenameRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
RenameKeyRequest renameKeyRequest = getOmRequest().getRenameKeyRequest();
OzoneManagerProtocolProtos.KeyArgs keyArgs =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index f7f54262a0..ea85459071 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
@@ -75,8 +76,8 @@ public class OMKeyRenameRequestWithFSO extends
OMKeyRenameRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
RenameKeyRequest renameKeyRequest = getOmRequest().getRenameKeyRequest();
KeyArgs keyArgs = renameKeyRequest.getKeyArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequest.java
index f68ae6f0fd..1f5e623da0 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequest.java
@@ -23,6 +23,7 @@ import java.nio.file.InvalidPathException;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -170,8 +171,8 @@ public class OMKeySetTimesRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
ozoneManager.getMetrics().incNumSetTime();
OmKeyInfo omKeyInfo;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequestWithFSO.java
index 429d77460e..5e3a00886b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeySetTimesRequestWithFSO.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ozone.om.request.key;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
@@ -62,8 +63,8 @@ public class OMKeySetTimesRequestWithFSO extends
OMKeySetTimesRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OmKeyInfo omKeyInfo = null;
OzoneManagerProtocolProtos.OMResponse.Builder omResponse = onInit();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java
index aa99ac8afe..20879a5094 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.key;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -80,8 +81,8 @@ public class OMKeysDeleteRequest extends OMKeyRequest {
}
@Override @SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
DeleteKeysRequest deleteKeyRequest = getOmRequest().getDeleteKeysRequest();
OzoneManagerProtocolProtos.DeleteKeyArgs deleteKeyArgs =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysRenameRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysRenameRequest.java
index 078f24dc45..0b93dd5794 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysRenameRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.key;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
@@ -80,8 +81,8 @@ public class OMKeysRenameRequest extends OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
RenameKeysRequest renameKeysRequest =
getOmRequest().getRenameKeysRequest();
RenameKeysArgs renameKeysArgs = renameKeysRequest.getRenameKeysArgs();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMOpenKeysDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMOpenKeysDeleteRequest.java
index 5df9f5a6a8..c1bc66ade9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMOpenKeysDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMOpenKeysDeleteRequest.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ozone.om.request.key;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -59,8 +60,8 @@ public class OMOpenKeysDeleteRequest extends OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumOpenKeyDeleteRequests();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
index 7dd6798f0f..e71c178ba5 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OmKeysDeleteRequestWithFSO.java
@@ -30,8 +30,6 @@ import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.om.response.key.OMKeysDeleteResponseWithFSO;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
@@ -44,21 +42,12 @@ import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
*/
public class OmKeysDeleteRequestWithFSO extends OMKeysDeleteRequest {
- private static final Logger LOG =
- LoggerFactory.getLogger(OmKeysDeleteRequestWithFSO.class);
-
public OmKeysDeleteRequestWithFSO(
OzoneManagerProtocolProtos.OMRequest omRequest,
BucketLayout bucketLayout) {
super(omRequest, bucketLayout);
}
- @Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
- }
-
@Override
protected OmKeyInfo getOmKeyInfo(
OzoneManager ozoneManager, OMMetadataManager omMetadataManager,
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
index cc24b0101b..dbc9464633 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
@@ -23,6 +23,7 @@ import java.nio.file.InvalidPathException;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -63,8 +64,8 @@ public abstract class OMKeyAclRequest extends OMClientRequest
{
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OmKeyInfo omKeyInfo = null;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
index 5eada5cbc3..5df1c0c004 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key.acl;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
@@ -57,8 +58,8 @@ public abstract class OMKeyAclRequestWithFSO extends
OMKeyAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OmKeyInfo omKeyInfo = null;
OzoneManagerProtocolProtos.OMResponse.Builder omResponse = onInit();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequest.java
index 0794725e25..31fa245fa5 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -148,10 +149,9 @@ public class OMKeyAddAclRequest extends OMKeyAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumAddAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
/**
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
index d4fe140509..4efba6d4ee 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key.acl;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -132,10 +133,9 @@ public class OMKeyAddAclRequestWithFSO extends
OMKeyAclRequestWithFSO {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumAddAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequest.java
index 1f4c16d833..7e4fc04eb3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -149,10 +150,9 @@ public class OMKeyRemoveAclRequest extends OMKeyAclRequest
{
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumRemoveAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
/**
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
index e17d989de3..6c031dc7e0 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key.acl;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -142,10 +143,9 @@ public class OMKeyRemoveAclRequestWithFSO extends
OMKeyAclRequestWithFSO {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumRemoveAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequest.java
index fd9d4856ab..0e5e1cf336 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -145,10 +146,9 @@ public class OMKeySetAclRequest extends OMKeyAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumSetAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
/**
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
index 192ac01649..97f4a99a66 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.key.acl;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -135,10 +136,9 @@ public class OMKeySetAclRequestWithFSO extends
OMKeyAclRequestWithFSO {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumSetAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/prefix/OMPrefixAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/prefix/OMPrefixAclRequest.java
index b18236b5ed..f523a16e87 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/prefix/OMPrefixAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/prefix/OMPrefixAclRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.InvalidPathException;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -53,8 +54,8 @@ public abstract class OMPrefixAclRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OmPrefixInfo omPrefixInfo = null;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3ExpiredMultipartUploadsAbortRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3ExpiredMultipartUploadsAbortRequest.java
index 3a572ecec4..53ceab9ebc 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3ExpiredMultipartUploadsAbortRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3ExpiredMultipartUploadsAbortRequest.java
@@ -20,6 +20,7 @@
package org.apache.hadoop.ozone.om.request.s3.multipart;
import com.google.common.base.Optional;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -72,8 +73,8 @@ public class S3ExpiredMultipartUploadsAbortRequest extends
OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumExpiredMPUAbortRequests();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
index 7665c1deb5..ef721cb530 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.request.s3.multipart;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OzoneConfigUtil;
@@ -107,8 +108,8 @@ public class S3InitiateMultipartUploadRequest extends
OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
MultipartInfoInitiateRequest multipartInfoInitiateRequest =
getOmRequest().getInitiateMultiPartUploadRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
index b8f356db92..d555cf62c9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.request.s3.multipart;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OzoneConfigUtil;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -66,8 +67,8 @@ public class S3InitiateMultipartUploadRequestWithFSO
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
MultipartInfoInitiateRequest multipartInfoInitiateRequest =
getOmRequest().getInitiateMultiPartUploadRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
index 9e2dbf5943..c36e7d3111 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.InvalidPathException;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
@@ -94,8 +95,8 @@ public class S3MultipartUploadAbortRequest extends
OMKeyRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
MultipartUploadAbortRequest multipartUploadAbortRequest = getOmRequest()
.getAbortMultiPartUploadRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
index 6092056893..bdd5ef1e90 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.s3.multipart;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -98,8 +99,8 @@ public class S3MultipartUploadCommitPartRequest extends
OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
MultipartCommitUploadPartRequest multipartCommitUploadPartRequest =
getOmRequest().getCommitMultiPartUploadRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
index de9340c237..9be3260093 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -103,8 +104,8 @@ public class S3MultipartUploadCompleteRequest extends
OMKeyRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
MultipartUploadCompleteRequest multipartUploadCompleteRequest =
getOmRequest().getCompleteMultiPartUploadRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
index 0ad6beb7ef..1edece52da 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.s3.security;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -99,8 +100,7 @@ public class OMSetSecretRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMClientResponse omClientResponse = null;
OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
getOmRequest());
@@ -123,7 +123,7 @@ public class OMSetSecretRequest extends OMClientRequest {
// Update S3SecretTable cache entry in this case
newS3SecretValue = new S3SecretValue(accessId, secretKey);
// Set the transactionLogIndex to be used for updating.
- newS3SecretValue.setTransactionLogIndex(transactionLogIndex);
+ newS3SecretValue.setTransactionLogIndex(termIndex.getIndex());
s3SecretManager
.updateCache(accessId, newS3SecretValue);
} else {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
index 24a7901922..dcf5688e39 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OMMultiTenantManager;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.slf4j.Logger;
@@ -126,8 +127,7 @@ public class S3GetSecretRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMClientResponse omClientResponse = null;
OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
getOmRequest());
@@ -161,7 +161,7 @@ public class S3GetSecretRequest extends OMClientRequest {
assignS3SecretValue =
new S3SecretValue(accessId, awsSecret.get());
// Set the transactionLogIndex to be used for updating.
-
assignS3SecretValue.setTransactionLogIndex(transactionLogIndex);
+
assignS3SecretValue.setTransactionLogIndex(termIndex.getIndex());
// Add cache entry first.
s3SecretManager.updateCache(accessId,
assignS3SecretValue);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
index 41a361ccc1..6bc288fd93 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.s3.security;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -77,8 +78,7 @@ public class S3RevokeSecretRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMClientResponse omClientResponse = null;
OMResponse.Builder omResponse =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMSetRangerServiceVersionRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMSetRangerServiceVersionRequest.java
index 2819b6c7cd..189d39e52c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMSetRangerServiceVersionRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMSetRangerServiceVersionRequest.java
@@ -18,6 +18,7 @@
*/
package org.apache.hadoop.ozone.om.request.s3.tenant;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -51,8 +52,7 @@ public class OMSetRangerServiceVersionRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMClientResponse omClientResponse;
final OMResponse.Builder omResponse =
@@ -65,7 +65,7 @@ public class OMSetRangerServiceVersionRequest extends
OMClientRequest {
omMetadataManager.getMetaTable().addCacheEntry(
new CacheKey<>(OzoneConsts.RANGER_OZONE_SERVICE_VERSION_KEY),
- CacheValue.get(transactionLogIndex, proposedVersionStr));
+ CacheValue.get(termIndex.getIndex(), proposedVersionStr));
omResponse.setSetRangerServiceVersionResponse(
SetRangerServiceVersionResponse.newBuilder().build());
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
index 263a8a2b39..a480df26e5 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignAdminRequest.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -149,8 +150,7 @@ public class OMTenantAssignAdminRequest extends
OMClientRequest {
@Override
@SuppressWarnings("checkstyle:methodlength")
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
@@ -205,7 +205,7 @@ public class OMTenantAssignAdminRequest extends
OMClientRequest {
.build();
omMetadataManager.getTenantAccessIdTable().addCacheEntry(
new CacheKey<>(accessId),
- CacheValue.get(transactionLogIndex, newOmDBAccessIdInfo));
+ CacheValue.get(termIndex.getIndex(), newOmDBAccessIdInfo));
// Update tenant cache
multiTenantManager.getCacheOp().assignTenantAdmin(accessId, delegated);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignUserAccessIdRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignUserAccessIdRequest.java
index 969a852523..a69b357419 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignUserAccessIdRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantAssignUserAccessIdRequest.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Preconditions;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OmUtils;
@@ -191,9 +192,8 @@ public class OMTenantAssignUserAccessIdRequest extends
OMClientRequest {
@Override
@SuppressWarnings("checkstyle:methodlength")
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
-
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
index 21c02310eb..cbc50b4695 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantCreateRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ipc.ProtobufRpcEngine;
@@ -211,8 +212,8 @@ public class OMTenantCreateRequest extends OMVolumeRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantDeleteRequest.java
index 788ab1a369..0508e2fbab 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantDeleteRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -102,8 +103,8 @@ public class OMTenantDeleteRequest extends OMVolumeRequest {
@Override
@SuppressWarnings("methodlength")
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeAdminRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeAdminRequest.java
index e9a2b4a507..eb876b46fe 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeAdminRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeAdminRequest.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -140,8 +141,7 @@ public class OMTenantRevokeAdminRequest extends
OMClientRequest {
@Override
@SuppressWarnings("checkstyle:methodlength")
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
@@ -195,7 +195,7 @@ public class OMTenantRevokeAdminRequest extends
OMClientRequest {
.build();
omMetadataManager.getTenantAccessIdTable().addCacheEntry(
new CacheKey<>(accessId),
- CacheValue.get(transactionLogIndex, newOmDBAccessIdInfo));
+ CacheValue.get(termIndex.getIndex(), newOmDBAccessIdInfo));
// Update tenant cache
multiTenantManager.getCacheOp().revokeTenantAdmin(accessId);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeUserAccessIdRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeUserAccessIdRequest.java
index 9e06704df8..e5c5609541 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeUserAccessIdRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tenant/OMTenantRevokeUserAccessIdRequest.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.request.s3.tenant;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -151,8 +152,8 @@ public class OMTenantRevokeUserAccessIdRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
final OMMultiTenantManager multiTenantManager =
ozoneManager.getMultiTenantManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMCancelDelegationTokenRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMCancelDelegationTokenRequest.java
index aaba7b4888..a01b79825b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMCancelDelegationTokenRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMCancelDelegationTokenRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.security;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -84,8 +85,8 @@ public class OMCancelDelegationTokenRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
Token<OzoneTokenIdentifier> token = getToken();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
index ad9b770e00..b46085dedb 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMGetDelegationTokenRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.security;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -128,8 +129,7 @@ public class OMGetDelegationTokenRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
UpdateGetDelegationTokenRequest updateGetDelegationTokenRequest =
getOmRequest().getUpdateGetDelegationTokenRequest();
@@ -180,7 +180,7 @@ public class OMGetDelegationTokenRequest extends
OMClientRequest {
// Update Cache.
omMetadataManager.getDelegationTokenTable().addCacheEntry(
new CacheKey<>(ozoneTokenIdentifier),
- CacheValue.get(transactionLogIndex, renewTime));
+ CacheValue.get(termIndex.getIndex(), renewTime));
omClientResponse =
new OMGetDelegationTokenResponse(ozoneTokenIdentifier, renewTime,
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
index ff04096a08..cf45ec9e60 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.InvalidPathException;
import java.util.Map;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -126,8 +127,7 @@ public class OMRenewDelegationTokenRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
UpdateRenewDelegationTokenRequest updateRenewDelegationTokenRequest =
getOmRequest().getUpdatedRenewDelegationTokenRequest();
@@ -166,7 +166,7 @@ public class OMRenewDelegationTokenRequest extends
OMClientRequest {
// Update Cache.
omMetadataManager.getDelegationTokenTable().addCacheEntry(
new CacheKey<>(ozoneTokenIdentifier),
- CacheValue.get(transactionLogIndex, renewTime));
+ CacheValue.get(termIndex.getIndex(), renewTime));
omClientResponse =
new OMRenewDelegationTokenResponse(ozoneTokenIdentifier, renewTime,
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotCreateRequest.java
index 8821030d56..25e60a61fa 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotCreateRequest.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.request.snapshot;
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.RDBStore;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
@@ -123,8 +124,7 @@ public class OMSnapshotCreateRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumSnapshotCreates();
@@ -183,8 +183,7 @@ public class OMSnapshotCreateRequest extends
OMClientRequest {
// pre-replicated key size counter in OmBucketInfo.
snapshotInfo.setReferencedSize(estimateBucketDataSize(omBucketInfo));
- addSnapshotInfoToSnapshotChainAndCache(omMetadataManager,
- transactionLogIndex);
+ addSnapshotInfoToSnapshotChainAndCache(omMetadataManager,
termIndex.getIndex());
omResponse.setCreateSnapshotResponse(
CreateSnapshotResponse.newBuilder()
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotDeleteRequest.java
index 936f54f0b8..5f1b8f1423 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotDeleteRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.snapshot;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OmUtils;
@@ -107,8 +108,7 @@ public class OMSnapshotDeleteRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumSnapshotDeletes();
@@ -178,7 +178,7 @@ public class OMSnapshotDeleteRequest extends
OMClientRequest {
// Update table cache first
omMetadataManager.getSnapshotInfoTable().addCacheEntry(
new CacheKey<>(tableKey),
- CacheValue.get(transactionLogIndex, snapshotInfo));
+ CacheValue.get(termIndex.getIndex(), snapshotInfo));
omResponse.setDeleteSnapshotResponse(
DeleteSnapshotResponse.newBuilder());
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
index 7e1e469aa2..122108ad65 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
@@ -20,6 +20,7 @@
package org.apache.hadoop.ozone.om.request.snapshot;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.OmSnapshotManager;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -58,8 +59,7 @@ public class OMSnapshotMoveDeletedKeysRequest extends
OMClientRequest {
@Override
@DisallowedUntilLayoutVersion(FILESYSTEM_SNAPSHOT)
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OmSnapshotManager omSnapshotManager = ozoneManager.getOmSnapshotManager();
OmMetadataManagerImpl omMetadataManager = (OmMetadataManagerImpl)
ozoneManager.getMetadataManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
index 25b225eeba..09711c7045 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.snapshot;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
@@ -53,8 +54,8 @@ public class OMSnapshotPurgeRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
OmSnapshotManager omSnapshotManager = ozoneManager.getOmSnapshotManager();
OmMetadataManagerImpl omMetadataManager = (OmMetadataManagerImpl)
ozoneManager.getMetadataManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
index 32b3c87f91..966a265af8 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotSetPropertyRequest.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ozone.om.request.snapshot;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -49,8 +50,7 @@ public class OMSnapshotSetPropertyRequest extends
OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
OMClientResponse omClientResponse = null;
OMMetadataManager metadataManager = ozoneManager.getMetadataManager();
@@ -85,7 +85,7 @@ public class OMSnapshotSetPropertyRequest extends
OMClientRequest {
// Update Table Cache
metadataManager.getSnapshotInfoTable().addCacheEntry(
new CacheKey<>(snapshotKey),
- CacheValue.get(trxnLogIndex, updatedSnapInfo));
+ CacheValue.get(termIndex.getIndex(), updatedSnapInfo));
omClientResponse = new OMSnapshotSetPropertyResponse(
omResponse.build(), updatedSnapInfo);
} catch (IOException ex) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMCancelPrepareRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMCancelPrepareRequest.java
index 40623f3fed..507b41f768 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMCancelPrepareRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMCancelPrepareRequest.java
@@ -17,6 +17,7 @@
package org.apache.hadoop.ozone.om.request.upgrade;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
@@ -48,11 +49,9 @@ public class OMCancelPrepareRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
- LOG.info("OM {} Received cancel prepare request with log index {}",
- ozoneManager.getOMNodeId(), transactionLogIndex);
+ LOG.info("OM {} Received cancel prepare request with log {}",
ozoneManager.getOMNodeId(), termIndex);
OMRequest omRequest = getOmRequest();
OMResponse.Builder responseBuilder =
@@ -80,9 +79,8 @@ public class OMCancelPrepareRequest extends OMClientRequest {
// not update cache.
ozoneManager.getPrepareState().cancelPrepare();
- LOG.info("OM {} prepare state cancelled at log index {}. Returning " +
- "response {}",
- ozoneManager.getOMNodeId(), transactionLogIndex, omResponse);
+ LOG.info("OM {} prepare state cancelled at log {}. Returning response
{}",
+ ozoneManager.getOMNodeId(), termIndex, omResponse);
} catch (IOException e) {
LOG.error("Cancel Prepare Request apply failed in {}. ",
ozoneManager.getOMNodeId(), e);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java
index ba638022f2..8ebf53706c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMFinalizeUpgradeRequest.java
@@ -22,6 +22,7 @@ import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
import org.apache.hadoop.hdds.protocol.proto.HddsProtos
.UpgradeFinalizationStatus;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -55,8 +56,7 @@ public class OMFinalizeUpgradeRequest extends OMClientRequest
{
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
LOG.trace("Request: {}", getOmRequest());
OMResponse.Builder responseBuilder =
OmResponseUtil.getOMResponseBuilder(getOmRequest());
@@ -92,7 +92,7 @@ public class OMFinalizeUpgradeRequest extends OMClientRequest
{
int lV = ozoneManager.getVersionManager().getMetadataLayoutVersion();
omMetadataManager.getMetaTable().addCacheEntry(
new CacheKey<>(LAYOUT_VERSION_KEY),
- CacheValue.get(transactionLogIndex, String.valueOf(lV)));
+ CacheValue.get(termIndex.getIndex(), String.valueOf(lV)));
FinalizeUpgradeResponse omResponse =
FinalizeUpgradeResponse.newBuilder()
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMPrepareRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMPrepareRequest.java
index d843a1f0d5..456da227b5 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMPrepareRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/upgrade/OMPrepareRequest.java
@@ -17,6 +17,7 @@
package org.apache.hadoop.ozone.om.request.upgrade;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerDoubleBuffer;
@@ -60,11 +61,10 @@ public class OMPrepareRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(
- OzoneManager ozoneManager, long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
- LOG.info("OM {} Received prepare request with log index {}",
- ozoneManager.getOMNodeId(), transactionLogIndex);
+ LOG.info("OM {} Received prepare request with log {}",
ozoneManager.getOMNodeId(), termIndex);
OMRequest omRequest = getOmRequest();
OzoneManagerProtocolProtos.PrepareRequestArgs args =
@@ -96,7 +96,7 @@ public class OMPrepareRequest extends OMClientRequest {
// the snapshot index in the prepared state.
OzoneManagerDoubleBuffer doubleBuffer =
ozoneManager.getOmRatisServer().getOmStateMachine().getOzoneManagerDoubleBuffer();
- doubleBuffer.add(response, transactionLogIndex);
+ doubleBuffer.add(response, termIndex);
OzoneManagerRatisServer omRatisServer = ozoneManager.getOmRatisServer();
RaftServer.Division division =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMEchoRPCWriteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMEchoRPCWriteRequest.java
index afe1d7bd18..aba8f6f6fc 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMEchoRPCWriteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMEchoRPCWriteRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.util;
import com.google.protobuf.ByteString;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.common.PayloadUtils;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
@@ -39,8 +40,7 @@ public class OMEchoRPCWriteRequest extends OMClientRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
EchoRPCRequest echoRPCRequest = getOmRequest().getEchoRPCRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java
index 39b23aff08..72667e3d43 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
@@ -92,8 +93,8 @@ public class OMVolumeCreateRequest extends OMVolumeRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
CreateVolumeRequest createVolumeRequest =
getOmRequest().getCreateVolumeRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java
index b5eaae8b1c..7a5c4be029 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.InvalidPathException;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos;
import org.slf4j.Logger;
@@ -64,8 +65,8 @@ public class OMVolumeDeleteRequest extends OMVolumeRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
DeleteVolumeRequest deleteVolumeRequest =
getOmRequest().getDeleteVolumeRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
index 5212592cd4..b789ebee9b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.volume;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -75,8 +76,8 @@ public class OMVolumeSetOwnerRequest extends OMVolumeRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
SetVolumePropertyRequest setVolumePropertyRequest =
getOmRequest().getSetVolumePropertyRequest();
Preconditions.checkNotNull(setVolumePropertyRequest);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
index 747685e555..675d77afa6 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
@@ -82,8 +83,8 @@ public class OMVolumeSetQuotaRequest extends OMVolumeRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long transactionLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long transactionLogIndex = termIndex.getIndex();
SetVolumePropertyRequest setVolumePropertyRequest =
getOmRequest().getSetVolumePropertyRequest();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
index 920619ba1d..b431d70fa7 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.volume.acl;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.audit.AuditLogger;
@@ -65,8 +66,8 @@ public abstract class OMVolumeAclRequest extends
OMVolumeRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
+ final long trxnLogIndex = termIndex.getIndex();
// protobuf guarantees volume and acls are non-null.
String volume = getVolumeName();
List<OzoneAcl> ozoneAcls = getAcls();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
index 0d88ec0eb9..1cc18efd05 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.om.request.volume.acl;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -140,9 +141,8 @@ public class OMVolumeAddAclRequest extends
OMVolumeAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumAddAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
index 616b6c08c4..b283f94c4b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.om.request.volume.acl;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -139,9 +140,8 @@ public class OMVolumeRemoveAclRequest extends
OMVolumeAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumRemoveAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
index 560e426817..1e75f75827 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.volume.acl;
import com.google.common.base.Preconditions;
+import org.apache.ratis.server.protocol.TermIndex;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
@@ -137,9 +138,8 @@ public class OMVolumeSetAclRequest extends
OMVolumeAclRequest {
}
@Override
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex) {
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
TermIndex termIndex) {
ozoneManager.getMetrics().incNumSetAcl();
- return super.validateAndUpdateCache(ozoneManager, trxnLogIndex);
+ return super.validateAndUpdateCache(ozoneManager, termIndex);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
index 11b6cc26c8..a33208a6d3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
@@ -31,6 +31,7 @@ import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdds.server.OzoneProtocolMessageDispatcher;
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
+import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ipc.ProcessingDetails.Timing;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.ozone.OmUtils;
@@ -322,7 +323,7 @@ public class OzoneManagerProtocolServerSideTranslatorPB
implements
createClientRequest(request, ozoneManager);
request = omClientRequest.preExecute(ozoneManager);
long index = transactionIndex.incrementAndGet();
- omClientResponse = handler.handleWriteRequest(request, index);
+ omClientResponse = handler.handleWriteRequest(request,
TransactionInfo.getTermIndex(index));
}
} catch (IOException ex) {
// As some preExecute returns error. So handle here.
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
index 072234dd80..818f61c19a 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
@@ -161,6 +161,7 @@ import static
org.apache.hadoop.util.MetricUtil.captureLatencyNs;
import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer.StatusAndMessages;
import org.apache.hadoop.util.Preconditions;
import org.apache.hadoop.util.ProtobufUtils;
+import org.apache.ratis.server.protocol.TermIndex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -391,8 +392,7 @@ public class OzoneManagerRequestHandler implements
RequestHandler {
}
@Override
- public OMClientResponse handleWriteRequest(OMRequest omRequest,
- long transactionLogIndex) throws IOException {
+ public OMClientResponse handleWriteRequest(OMRequest omRequest, TermIndex
termIndex) throws IOException {
injectPause();
OMClientRequest omClientRequest =
OzoneManagerRatisUtils.createClientRequest(omRequest, impl);
@@ -400,12 +400,12 @@ public class OzoneManagerRequestHandler implements
RequestHandler {
impl.getPerfMetrics().getValidateAndUpdateCacneLatencyNs(),
() -> {
OMClientResponse omClientResponse =
- omClientRequest.validateAndUpdateCache(getOzoneManager(),
transactionLogIndex);
+ omClientRequest.validateAndUpdateCache(getOzoneManager(),
termIndex);
Preconditions.checkNotNull(omClientResponse,
"omClientResponse returned by validateAndUpdateCache cannot be
null");
if (omRequest.getCmdType() != Type.Prepare) {
omClientResponse.setFlushFuture(
- ozoneManagerDoubleBuffer.add(omClientResponse,
transactionLogIndex));
+ ozoneManagerDoubleBuffer.add(omClientResponse, termIndex));
}
return omClientResponse;
});
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
index d1a2587744..17e9f0a7d6 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
@@ -24,6 +24,7 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
OMRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
OMResponse;
+import org.apache.ratis.server.protocol.TermIndex;
import java.io.IOException;
@@ -53,12 +54,12 @@ public interface RequestHandler {
* OzoneManagerStateMachine applyTransaction method. In non-HA this will be
* called from {@link OzoneManagerProtocolServerSideTranslatorPB} for write
* requests.
+ *
* @param omRequest
- * @param transactionLogIndex - ratis transaction log index
+ * @param termIndex - ratis transaction log (term, index)
* @return OMClientResponse
*/
- OMClientResponse handleWriteRequest(OMRequest omRequest,
- long transactionLogIndex) throws IOException;
+ OMClientResponse handleWriteRequest(OMRequest omRequest, TermIndex
termIndex) throws IOException;
/**
* Update the OzoneManagerDoubleBuffer. This will be called when
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
index 6659ef852f..9fe008f417 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
@@ -29,6 +29,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.AuditMessage;
import org.apache.hadoop.ozone.om.OMConfigKeys;
@@ -144,7 +145,6 @@ class TestOzoneManagerDoubleBuffer {
.setOzoneManagerRatisSnapShot(ozoneManagerRatisSnapshot)
.setmaxUnFlushedTransactionCount(1000)
.enableRatis(true)
- .setIndexToTerm((i) -> 1L)
.setFlushNotifier(spyFlushNotifier)
.build();
@@ -240,7 +240,7 @@ class TestOzoneManagerDoubleBuffer {
doubleBuffer.stopDaemon();
for (int i = 0; i < omClientResponses.size(); i++) {
- doubleBuffer.add(omClientResponses.get(i), i);
+ doubleBuffer.add(omClientResponses.get(i),
TransactionInfo.getTermIndex(i));
}
// Flush the current buffer.
@@ -292,7 +292,7 @@ class TestOzoneManagerDoubleBuffer {
// Init double buffer.
for (OMClientResponse omClientResponse : omClientResponses) {
- doubleBuffer.add(omClientResponse, transactionIndex++);
+ doubleBuffer.add(omClientResponse,
TransactionInfo.getTermIndex(transactionIndex++));
}
assertEquals(initialSize,
doubleBuffer.getCurrentBufferSize());
@@ -386,7 +386,7 @@ class TestOzoneManagerDoubleBuffer {
// Run validateAndUpdateCache
OMClientResponse omClientResponse =
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, txLogIndex);
- doubleBuffer.add(omClientResponse, txLogIndex);
+ doubleBuffer.add(omClientResponse,
TransactionInfo.getTermIndex(txLogIndex));
}
private OzoneManagerProtocolProtos.OMRequest s3GetSecretRequest(
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
index 0b01cd24af..545047e43d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
+import org.apache.ratis.server.protocol.TermIndex;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -84,7 +85,6 @@ public class TestOzoneManagerDoubleBufferWithDummyResponse {
.setOzoneManagerRatisSnapShot(ozoneManagerRatisSnapshot)
.setmaxUnFlushedTransactionCount(10000)
.enableRatis(true)
- .setIndexToTerm((val) -> term)
.build();
}
@@ -113,7 +113,7 @@ public class TestOzoneManagerDoubleBufferWithDummyResponse {
for (int i = 0; i < bucketCount; i++) {
doubleBuffer.add(createDummyBucketResponse(volumeName),
- trxId.incrementAndGet());
+ TermIndex.valueOf(term, trxId.incrementAndGet()));
}
waitFor(() -> metrics.getTotalNumOfFlushedTransactions() == bucketCount,
100, 60000);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
index e3549dab18..294b012121 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
@@ -40,6 +40,7 @@ import
org.apache.hadoop.ozone.om.request.volume.OMVolumeCreateRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketInfo;
+import org.apache.ratis.server.protocol.TermIndex;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -113,7 +114,6 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
.setOzoneManagerRatisSnapShot(ozoneManagerRatisSnapshot)
.setmaxUnFlushedTransactionCount(100000)
.enableRatis(true)
- .setIndexToTerm((i) -> term)
.build();
}
@@ -310,9 +310,9 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
OMBucketDeleteRequest omBucketDeleteRequest =
new OMBucketDeleteRequest(omRequest);
- OMClientResponse omClientResponse =
- omBucketDeleteRequest.validateAndUpdateCache(ozoneManager,
transactionID);
- doubleBuffer.add(omClientResponse, transactionID);
+ final TermIndex termIndex = TermIndex.valueOf(term, transactionID);
+ OMClientResponse omClientResponse =
omBucketDeleteRequest.validateAndUpdateCache(ozoneManager, termIndex);
+ doubleBuffer.add(omClientResponse, termIndex);
return omClientResponse;
}
@@ -459,9 +459,9 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
OMVolumeCreateRequest omVolumeCreateRequest =
new OMVolumeCreateRequest(omRequest);
- OMClientResponse omClientResponse =
- omVolumeCreateRequest.validateAndUpdateCache(ozoneManager,
transactionId);
- doubleBuffer.add(omClientResponse, transactionId);
+ final TermIndex termIndex = TransactionInfo.getTermIndex(transactionId);
+ OMClientResponse omClientResponse =
omVolumeCreateRequest.validateAndUpdateCache(ozoneManager, termIndex);
+ doubleBuffer.add(omClientResponse, termIndex);
return omClientResponse;
}
@@ -481,9 +481,9 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
OMBucketCreateRequest omBucketCreateRequest =
new OMBucketCreateRequest(omRequest);
- OMClientResponse omClientResponse =
- omBucketCreateRequest.validateAndUpdateCache(ozoneManager,
transactionID);
- doubleBuffer.add(omClientResponse, transactionID);
+ final TermIndex termIndex = TermIndex.valueOf(term, transactionID);
+ OMClientResponse omClientResponse =
omBucketCreateRequest.validateAndUpdateCache(ozoneManager, termIndex);
+ doubleBuffer.add(omClientResponse, termIndex);
return (OMBucketCreateResponse) omClientResponse;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
