diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java index 3f6d7a82320e..c0f6c2a78d24 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java @@ -511,7 +511,7 @@ public static File createOMDir(String dirPath) { * @return {@link RepeatedOmKeyInfo} */ public static RepeatedOmKeyInfo prepareKeyForDelete(OmKeyInfo keyInfo, - long trxnLogIndex, boolean isRatisEnabled) { + long trxnLogIndex) { // If this key is in a GDPR enforced bucket, then before moving // KeyInfo to deletedTable, remove the GDPR related metadata and // FileEncryptionInfo from KeyInfo. @@ -525,7 +525,7 @@ public static RepeatedOmKeyInfo prepareKeyForDelete(OmKeyInfo keyInfo, } // Set the updateID - keyInfo.setUpdateID(trxnLogIndex, isRatisEnabled); + keyInfo.setUpdateID(trxnLogIndex); //The key doesn't exist in deletedTable, so create a new instance. return new RepeatedOmKeyInfo(keyInfo); diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java index 7c1e01d2ae5c..baeac977eda8 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java @@ -174,6 +174,7 @@ private OmMultipartKeyInfo(Builder b) { /** Copy constructor. */ private OmMultipartKeyInfo(OmMultipartKeyInfo b) { + super(b); this.uploadID = b.uploadID; this.creationTime = b.creationTime; this.replicationConfig = b.replicationConfig; @@ -181,8 +182,6 @@ private OmMultipartKeyInfo(OmMultipartKeyInfo b) { // is added, it returns a new shallow copy of the PartKeyInfoMap Object // so here we can directly pass in partKeyInfoMap this.partKeyInfoMap = b.partKeyInfoMap; - setObjectID(b.getObjectID()); - setUpdateID(b.getUpdateID()); this.parentID = b.parentID; } diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithMetadata.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithMetadata.java index 0993e9a4cdd8..f5fb5146075c 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithMetadata.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithMetadata.java @@ -35,6 +35,10 @@ protected WithMetadata(Builder b) { metadata = b.metadata; } + protected WithMetadata(WithMetadata other) { + metadata = new ConcurrentHashMap<>(other.getMetadata()); + } + /** * Custom key value metadata. */ diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java index af9508196260..ebf4c4a9e23d 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java @@ -37,6 +37,12 @@ protected WithObjectID(Builder b) { updateID = b.updateID; } + protected WithObjectID(WithObjectID other) { + super(other); + objectID = other.objectID; + updateID = other.updateID; + } + /** * ObjectIDs are unique and immutable identifier for each object in the * System. @@ -73,10 +79,8 @@ public final void setObjectID(long obId) { /** * Sets the update ID. For each modification of this object, we will set * this to a value greater than the current value. - * @param updateId long - * @param isRatisEnabled boolean */ - public final void setUpdateID(long updateId, boolean isRatisEnabled) { + public final void setUpdateID(long newValue) { // Because in non-HA, we have multiple rpc handler threads and // transactionID is generated in OzoneManagerServerSideTranslatorPB. @@ -103,14 +107,15 @@ public final void setUpdateID(long updateId, boolean isRatisEnabled) { // Main reason, in non-HA transaction Index after restart starts from 0. // And also because of this same reason we don't do replay checks in non-HA. - if (isRatisEnabled && updateId < this.getUpdateID()) { + final long currentValue = getUpdateID(); + if (newValue < currentValue) { throw new IllegalArgumentException(String.format( "Trying to set updateID to %d which is not greater than the " + - "current value of %d for %s", updateId, this.getUpdateID(), + "current value of %d for %s", newValue, currentValue, getObjectInfo())); } - this.setUpdateID(updateId); + updateID = newValue; } /** Hook method, customized in subclasses. */ @@ -118,10 +123,6 @@ public String getObjectInfo() { return this.toString(); } - public final void setUpdateID(long updateID) { - this.updateID = updateID; - } - /** Builder for {@link WithObjectID}. */ public static class Builder extends WithMetadata.Builder { private long objectID; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java index 7e518687beaf..83800a5ede28 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java @@ -179,7 +179,6 @@ import static org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType.WRITE; import static org.apache.ozone.test.GenericTestUtils.getTestStartTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assumptions.assumeThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -4934,8 +4933,6 @@ public void testUploadWithStreamAndMemoryMappedBuffer(@TempDir Path dir) throws @Test public void testParallelDeleteBucketAndCreateKey() throws IOException, InterruptedException, TimeoutException { - assumeThat(getCluster().getOzoneManager().isRatisEnabled()).isTrue(); - String volumeName = UUID.randomUUID().toString(); String bucketName = UUID.randomUUID().toString(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java index 4bdc29d61462..c155a7b0b81d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRangerBGSyncService.java @@ -193,7 +193,6 @@ public void setUp() throws IOException { omMetadataManager = new OmMetadataManagerImpl(conf, ozoneManager); when(ozoneManager.getMetrics()).thenReturn(omMetrics); when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); - when(ozoneManager.isRatisEnabled()).thenReturn(true); auditLogger = mock(AuditLogger.class); when(ozoneManager.getAuditLogger()).thenReturn(auditLogger); doNothing().when(auditLogger).logWrite(any(AuditMessage.class)); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index 25684cc4527d..4654f1afc179 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -4233,14 +4233,6 @@ public void checkLeaderStatus() throws OMNotLeaderException, } } - /** - * Return if Ratis is enabled or not. - */ - // TODO remove in HDDS-12161 - public boolean isRatisEnabled() { - return true; - } - /** * @return true if Ozone filesystem snapshot is enabled, false otherwise. */ 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 42ae90b91819..21b5a761aa31 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 @@ -99,7 +99,6 @@ OMClientResponse getResponse() { public static final class Builder { private OMMetadataManager omMetadataManager; private Consumer updateLastAppliedIndex = termIndex -> { }; - private boolean isRatisEnabled = false; private boolean isTracingEnabled = false; private int maxUnFlushedTransactionCount = 0; private FlushNotifier flushNotifier; @@ -118,11 +117,6 @@ Builder setUpdateLastAppliedIndex(Consumer updateLastAppliedIndex) { return this; } - public Builder enableRatis(boolean enableRatis) { - this.isRatisEnabled = enableRatis; - return this; - } - public Builder enableTracing(boolean enableTracing) { this.isTracingEnabled = enableTracing; return this; @@ -149,9 +143,8 @@ public Builder setS3SecretManager(S3SecretManager s3SecretManager) { } public OzoneManagerDoubleBuffer build() { - Preconditions.assertTrue(isRatisEnabled == maxUnFlushedTransactionCount > 0L, - () -> "Ratis is " + (isRatisEnabled ? "enabled" : "disabled") - + " but maxUnFlushedTransactionCount = " + maxUnFlushedTransactionCount); + Preconditions.assertTrue(maxUnFlushedTransactionCount > 0L, + () -> "maxUnFlushedTransactionCount = " + maxUnFlushedTransactionCount); if (flushNotifier == null) { flushNotifier = new FlushNotifier(); } @@ -172,7 +165,6 @@ static Semaphore newSemaphore(int permits) { private Queue readyBuffer; /** * Limit the number of un-flushed transactions for {@link OzoneManagerStateMachine}. - * It is set to null if ratis is disabled; see {@link #isRatisEnabled()}. */ private final Semaphore unFlushedTransactions; @@ -221,16 +213,11 @@ public OzoneManagerDoubleBuffer start() { return this; } - private boolean isRatisEnabled() { - return unFlushedTransactions != null; - } - /** * Acquires the given number of permits from unFlushedTransactions, * blocking until all are available, or the thread is interrupted. */ public void acquireUnFlushedTransactions(int n) throws InterruptedException { - Preconditions.assertTrue(isRatisEnabled(), "Ratis is not enabled"); unFlushedTransactions.acquire(n); } @@ -369,15 +356,6 @@ private void flushBatch(Queue buffer) throws IOException { metrics.updateFlushTime(Time.monotonicNow() - startTime); } - // Complete futures first and then do other things. - // So that handler threads will be released. - if (!isRatisEnabled()) { - buffer.stream() - .map(Entry::getResponse) - .map(OMClientResponse::getFlushFuture) - .forEach(f -> f.complete(null)); - } - final long accumulativeCount = flushedTransactionCount.addAndGet(flushedTransactionsSize); final long flushedIterations = flushIterations.incrementAndGet(); LOG.debug("Sync iteration: {}, size in this iteration: {}, accumulative count: {}", @@ -386,9 +364,7 @@ private void flushBatch(Queue buffer) throws IOException { // Clean up committed transactions. cleanupCache(cleanupEpochs); - if (isRatisEnabled()) { - releaseUnFlushedTransactions(flushedTransactionsSize); - } + releaseUnFlushedTransactions(flushedTransactionsSize); // update the last updated index in OzoneManagerStateMachine. updateLastAppliedIndex.accept(lastTransaction); @@ -555,10 +531,6 @@ private void terminate(Throwable t, int status, OMResponse omResponse) { public synchronized void add(OMClientResponse response, TermIndex termIndex) { currentBuffer.add(new Entry(termIndex, response)); notify(); - - if (!isRatisEnabled()) { - response.setFlushFuture(new CompletableFuture<>()); - } } /** 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 62e548f408b7..f75073133c50 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 @@ -463,7 +463,6 @@ public OzoneManagerDoubleBuffer buildDoubleBufferForRatis() { .setMaxUnFlushedTransactionCount(maxUnFlushedTransactionCount) .setThreadPrefix(threadPrefix) .setS3SecretManager(ozoneManager.getS3SecretManager()) - .enableRatis(true) .enableTracing(isTracingEnabled) .build() .start(); 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 38a4d78b5385..7b41e102a74c 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 @@ -245,8 +245,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Add objectID and updateID omBucketInfo.setObjectID( ozoneManager.getObjectIdFromTxId(transactionLogIndex)); - omBucketInfo.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omBucketInfo.setUpdateID(transactionLogIndex); addDefaultAcls(omBucketInfo, omVolumeArgs, ozoneManager); 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 239083a58c8c..b8c869c2aae3 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 @@ -155,8 +155,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omBucketInfo.setModificationTime( setBucketPropertyRequest.getModificationTime()); // Set the updateID to current transaction log index - omBucketInfo.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omBucketInfo.setUpdateID(transactionLogIndex); // Update table cache. omMetadataManager.getBucketTable().addCacheEntry( 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 23c92b8ae545..3c47297804f6 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 @@ -108,8 +108,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } operationResult = omBucketAclOp.test(ozoneAcls, omBucketInfo); - omBucketInfo.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omBucketInfo.setUpdateID(transactionLogIndex); if (operationResult) { // Update the modification time when updating ACLs of Bucket. 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 f3df379103d3..82497318ad20 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 @@ -247,7 +247,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut keyArgs.getDataSize(), locations, getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(), omBucketInfo, pathInfo, trxnLogIndex, ozoneManager.getObjectIdFromTxId(trxnLogIndex), - ozoneManager.isRatisEnabled(), repConfig, ozoneManager.getConfiguration()); + repConfig, ozoneManager.getConfiguration()); validateEncryptionKeyInfo(omBucketInfo, keyArgs); long openVersion = omKeyInfo.getLatestVersionLocations().getVersion(); 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 f64454d3962e..9a01dc5ddf0f 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 @@ -170,7 +170,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(), bucketInfo, pathInfoFSO, trxnLogIndex, pathInfoFSO.getLeafNodeObjectId(), - ozoneManager.isRatisEnabled(), repConfig, ozoneManager.getConfiguration()); + repConfig, ozoneManager.getConfiguration()); validateEncryptionKeyInfo(bucketInfo, keyArgs); long openVersion = omFileInfo.getLatestVersionLocations().getVersion(); 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 0ae92f806ad2..e85cdbe90dc3 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 @@ -238,7 +238,7 @@ private RecoverLeaseResponse doWork(OzoneManager ozoneManager, KEY_UNDER_LEASE_SOFT_LIMIT_PERIOD); } openKeyInfo.getMetadata().put(OzoneConsts.LEASE_RECOVERY, "true"); - openKeyInfo.setUpdateID(transactionLogIndex, ozoneManager.isRatisEnabled()); + openKeyInfo.setUpdateID(transactionLogIndex); openKeyInfo.setModificationTime(Time.now()); // add to cache. omMetadataManager.getOpenKeyTable(getBucketLayout()).addCacheEntry( 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 b995f7934537..980b42e5f989 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 @@ -239,7 +239,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut openKeyInfo.setModificationTime(keyArgs.getModificationTime()); // Set the UpdateID to current transactionLogIndex - openKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + openKeyInfo.setUpdateID(trxnLogIndex); // Add to cache. omMetadataManager.getOpenKeyTable(getBucketLayout()).addCacheEntry( 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 cba650644ad5..a8dbd209d653 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 @@ -162,7 +162,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut openKeyInfo.setModificationTime(keyArgs.getModificationTime()); // Set the UpdateID to current transactionLogIndex - openKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + openKeyInfo.setUpdateID(trxnLogIndex); // Add to cache. addOpenTableCacheEntry(trxnLogIndex, omMetadataManager, openKeyName, keyName, 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 4758b8cb7883..eb335d4ff939 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 @@ -203,7 +203,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } return new OMDirectoriesPurgeResponseWithFSO( - omResponse.build(), purgeRequests, ozoneManager.isRatisEnabled(), - getBucketLayout(), volBucketInfoMap, fromSnapshotInfo, openKeyInfoMap); + omResponse.build(), purgeRequests, + getBucketLayout(), volBucketInfoMap, fromSnapshotInfo, openKeyInfoMap); } } 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 25b09a203ec2..23d10d6b6821 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 @@ -278,7 +278,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut openKeyToDelete = omMetadataManager.getOpenKeyTable(getBucketLayout()).get(dbOpenKeyToDeleteKey); openKeyToDelete.getMetadata().put(OzoneConsts.OVERWRITTEN_HSYNC_KEY, "true"); openKeyToDelete.setModificationTime(Time.now()); - openKeyToDelete.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + openKeyToDelete.setUpdateID(trxnLogIndex); omMetadataManager.getOpenKeyTable(getBucketLayout()).addCacheEntry( dbOpenKeyToDeleteKey, openKeyToDelete, trxnLogIndex); } @@ -310,7 +310,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.updateLocationInfoList(locationInfoList, false); // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); Map oldKeyVersionsToDeleteMap = null; long correctedSpace = omKeyInfo.getReplicatedSize(); @@ -324,7 +324,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Subtract the size of blocks to be overwritten. correctedSpace -= keyToDelete.getReplicatedSize(); RepeatedOmKeyInfo oldVerKeyInfo = getOldVersionsToCleanUp( - keyToDelete, trxnLogIndex, ozoneManager.isRatisEnabled()); + keyToDelete, trxnLogIndex); checkBucketQuotaInBytes(omMetadataManager, omBucketInfo, correctedSpace); // using pseudoObjId as objectId can be same in case of overwrite key 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 c1e686d3ce04..4f390fa91674 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 @@ -205,7 +205,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omMetadataManager, dbOpenKeyToDeleteKey, keyName); openKeyToDelete.getMetadata().put(OzoneConsts.OVERWRITTEN_HSYNC_KEY, "true"); openKeyToDelete.setModificationTime(Time.now()); - openKeyToDelete.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + openKeyToDelete.setUpdateID(trxnLogIndex); OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager, dbOpenKeyToDeleteKey, openKeyToDelete, keyName, fileName, trxnLogIndex); } @@ -230,7 +230,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.updateLocationInfoList(locationInfoList, false); // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // If bucket versioning is turned on during the update, between key // creation and key commit, old versions will be just overwritten and @@ -253,7 +253,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Subtract the size of blocks to be overwritten. correctedSpace -= keyToDelete.getReplicatedSize(); RepeatedOmKeyInfo oldVerKeyInfo = getOldVersionsToCleanUp( - keyToDelete, trxnLogIndex, ozoneManager.isRatisEnabled()); + keyToDelete, trxnLogIndex); checkBucketQuotaInBytes(omMetadataManager, omBucketInfo, correctedSpace); String delKeyName = omMetadataManager 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 4ac619a3a47e..0776bcd9d6aa 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 @@ -277,7 +277,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut keyArgs.getDataSize(), locations, getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(), bucketInfo, pathInfo, trxnLogIndex, ozoneManager.getObjectIdFromTxId(trxnLogIndex), - ozoneManager.isRatisEnabled(), replicationConfig, ozoneManager.getConfiguration()); + replicationConfig, ozoneManager.getConfiguration()); validateEncryptionKeyInfo(bucketInfo, keyArgs); 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 31e9d088f7e9..397e78291683 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 @@ -154,7 +154,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(), bucketInfo, pathInfoFSO, trxnLogIndex, pathInfoFSO.getLeafNodeObjectId(), - ozoneManager.isRatisEnabled(), repConfig, ozoneManager.getConfiguration()); + repConfig, ozoneManager.getConfiguration()); validateEncryptionKeyInfo(bucketInfo, keyArgs); 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 3885c18aff3c..48252aeb0078 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 @@ -151,7 +151,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Update table cache. Put a tombstone entry omMetadataManager.getKeyTable(getBucketLayout()).addCacheEntry( @@ -185,7 +185,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omClientResponse = new OMKeyDeleteResponse( omResponse.setDeleteKeyResponse(DeleteKeyResponse.newBuilder()) - .build(), omKeyInfo, ozoneManager.isRatisEnabled(), + .build(), omKeyInfo, omBucketInfo.copyObject(), deletedOpenKeyInfo); result = Result.SUCCESS; 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 19fed5d85db4..1d386a4e70e6 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 @@ -122,7 +122,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.setKeyName(fileName); // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); final long volumeId = omMetadataManager.getVolumeId(volumeName); final long bucketId = omMetadataManager.getBucketId(volumeName, @@ -177,7 +177,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omClientResponse = new OMKeyDeleteResponseWithFSO(omResponse .setDeleteKeyResponse(DeleteKeyResponse.newBuilder()).build(), - keyName, omKeyInfo, ozoneManager.isRatisEnabled(), + keyName, omKeyInfo, omBucketInfo.copyObject(), keyStatus.isDirectory(), volumeId, deletedOpenKeyInfo); result = Result.SUCCESS; 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 1c99fc1814a4..92f815020e7a 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 @@ -181,7 +181,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut throw new OMException("Key not found " + fromKey, KEY_NOT_FOUND); } - fromKeyValue.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + fromKeyValue.setUpdateID(trxnLogIndex); fromKeyValue.setKeyName(toKeyName); 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 5919290062eb..016f77a71c3f 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 @@ -293,7 +293,7 @@ private OMClientResponse renameKey(OmKeyInfo toKeyParent, String toKeyName, String bucketKey = metadataMgr.getBucketKey( fromKeyValue.getVolumeName(), fromKeyValue.getBucketName()); - fromKeyValue.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + fromKeyValue.setUpdateID(trxnLogIndex); // Set toFileName fromKeyValue.setKeyName(toKeyFileName); fromKeyValue.setFileName(toKeyFileName); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java index 6a467f3acf58..1ca14901abd8 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java @@ -1015,13 +1015,13 @@ protected OmKeyInfo prepareKeyInfo( @Nonnull PrefixManager prefixManager, @Nullable OmBucketInfo omBucketInfo, OMFileRequest.OMPathInfo omPathInfo, - long transactionLogIndex, long objectID, boolean isRatisEnabled, + long transactionLogIndex, long objectID, ReplicationConfig replicationConfig, OzoneConfiguration config) throws IOException { return prepareFileInfo(omMetadataManager, keyArgs, dbKeyInfo, size, locations, encInfo, prefixManager, omBucketInfo, omPathInfo, - transactionLogIndex, objectID, isRatisEnabled, replicationConfig, config); + transactionLogIndex, objectID, replicationConfig, config); } /** @@ -1039,7 +1039,7 @@ protected OmKeyInfo prepareFileInfo( @Nullable OmBucketInfo omBucketInfo, OMFileRequest.OMPathInfo omPathInfo, long transactionLogIndex, long objectID, - boolean isRatisEnabled, ReplicationConfig replicationConfig, + ReplicationConfig replicationConfig, OzoneConfiguration config) throws IOException { if (keyArgs.getIsMultipartKey()) { return prepareMultipartFileInfo(omMetadataManager, keyArgs, @@ -1061,7 +1061,7 @@ protected OmKeyInfo prepareFileInfo( // The modification time is set in preExecute. Use the same // modification time. dbKeyInfo.setModificationTime(keyArgs.getModificationTime()); - dbKeyInfo.setUpdateID(transactionLogIndex, isRatisEnabled); + dbKeyInfo.setUpdateID(transactionLogIndex); dbKeyInfo.setReplicationConfig(replicationConfig); // Construct a new metadata map from KeyArgs. @@ -1219,15 +1219,12 @@ protected String getDBMultipartOpenKey(String volumeName, String bucketName, * * @param keyToDelete OmKeyInfo of a key to be in deleteTable * @param trxnLogIndex - * @param isRatisEnabled * @return Old keys eligible for deletion. * @throws IOException */ protected RepeatedOmKeyInfo getOldVersionsToCleanUp( - @Nonnull OmKeyInfo keyToDelete, long trxnLogIndex, - boolean isRatisEnabled) throws IOException { - return OmUtils.prepareKeyForDelete(keyToDelete, - trxnLogIndex, isRatisEnabled); + @Nonnull OmKeyInfo keyToDelete, long trxnLogIndex) throws IOException { + return OmUtils.prepareKeyForDelete(keyToDelete, trxnLogIndex); } protected OzoneLockStrategy getOzoneLockStrategy(OzoneManager ozoneManager) { 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 7c548029ce0e..2592549cff53 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 @@ -218,7 +218,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut operationResult = true; apply(omKeyInfo); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // update cache. omMetadataManager.getKeyTable(getBucketLayout()) 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 630e0987aed3..31a80fe4b55b 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 @@ -108,7 +108,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut boolean isDirectory = keyStatus.isDirectory(); operationResult = true; apply(omKeyInfo); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // update cache. if (isDirectory) { 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 27fcf55ef908..9625e0e9534e 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 @@ -291,7 +291,7 @@ protected OMClientResponse getOmClientResponse(OzoneManager ozoneManager, DeleteKeysResponse.newBuilder().setStatus(deleteStatus) .setUnDeletedKeys(unDeletedKeys).addAllErrors(deleteKeyErrors)) .setStatus(deleteStatus ? OK : PARTIAL_DELETE).setSuccess(deleteStatus) - .build(), omKeyInfoList, ozoneManager.isRatisEnabled(), + .build(), omKeyInfoList, omBucketInfo.copyObject(), openKeyInfoMap); return omClientResponse; } @@ -308,7 +308,7 @@ protected long markKeysAsDeletedInCache(OzoneManager ozoneManager, new CacheKey<>(omMetadataManager.getOzoneKey(volumeName, bucketName, keyName)), CacheValue.get(trxnLogIndex)); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); quotaReleased += sumBlockLengths(omKeyInfo); // If omKeyInfo has hsync metadata, delete its corresponding open key as well 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 64da82412566..413d82768cc1 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 @@ -194,7 +194,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut continue; } - fromKeyValue.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + fromKeyValue.setUpdateID(trxnLogIndex); fromKeyValue.setKeyName(toKeyName); 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 f6f6a0cef23a..6b1beb1e7ee4 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 @@ -97,7 +97,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } omClientResponse = new OMOpenKeysDeleteResponse(omResponse.build(), - deletedOpenKeys, ozoneManager.isRatisEnabled(), getBucketLayout()); + deletedOpenKeys, getBucketLayout()); result = Result.SUCCESS; } catch (IOException | InvalidPathException ex) { @@ -161,8 +161,7 @@ private void updateOpenKeyTableCache(OzoneManager ozoneManager, omMetadataManager.getOpenKeyTable(getBucketLayout()) .get(fullKeyName); if (omKeyInfo != null) { - if (ozoneManager.isRatisEnabled() && - trxnLogIndex < omKeyInfo.getUpdateID()) { + if (trxnLogIndex < omKeyInfo.getUpdateID()) { LOG.warn("Transaction log index {} is smaller than " + "the current updateID {} of key {}, skipping deletion.", trxnLogIndex, omKeyInfo.getUpdateID(), fullKeyName); @@ -170,7 +169,7 @@ private void updateOpenKeyTableCache(OzoneManager ozoneManager, } // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); deletedOpenKeys.put(fullKeyName, omKeyInfo); // Update openKeyTable cache. 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 ef154c9b1471..ba44e6f35c7a 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 @@ -107,7 +107,7 @@ protected long markKeysAsDeletedInCache( .getOzonePathKey(volumeId, bucketId, parentId, fileName)), CacheValue.get(trxnLogIndex)); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); quotaReleased += sumBlockLengths(omKeyInfo); // If omKeyInfo has hsync metadata, delete its corresponding open key as well @@ -139,7 +139,7 @@ protected long markKeysAsDeletedInCache( omKeyInfo.getFileName())), CacheValue.get(trxnLogIndex)); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); quotaReleased += sumBlockLengths(omKeyInfo); } return quotaReleased; @@ -164,7 +164,7 @@ protected OMClientResponse getOmClientResponse(OzoneManager ozoneManager, OzoneManagerProtocolProtos.DeleteKeysResponse.newBuilder() .setStatus(deleteStatus).setUnDeletedKeys(unDeletedKeys).addAllErrors(deleteKeyErrors)) .setStatus(deleteStatus ? OK : PARTIAL_DELETE).setSuccess(deleteStatus) - .build(), omKeyInfoList, dirList, ozoneManager.isRatisEnabled(), + .build(), omKeyInfoList, dirList, omBucketInfo.copyObject(), volumeId, openKeyInfoMap); return omClientResponse; } 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 c847caa9481a..1f97aebc2591 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 @@ -109,7 +109,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } operationResult = apply(omKeyInfo, trxnLogIndex); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Update the modification time when updating ACLs of Key. long modificationTime = omKeyInfo.getModificationTime(); 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 8f9cbbc6d8eb..1e2c2deaf768 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 @@ -104,7 +104,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.getParentObjectID(), omKeyInfo.getFileName()); boolean isDirectory = keyStatus.isDirectory(); operationResult = apply(omKeyInfo, trxnLogIndex); - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Update the modification time when updating ACLs of Key. long modificationTime = omKeyInfo.getModificationTime(); 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 0369c0bbbcc8..98e75ae8ca3b 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 @@ -92,7 +92,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omPrefixInfo = omMetadataManager.getPrefixTable().get(prefixPath); if (omPrefixInfo != null) { - omPrefixInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omPrefixInfo.setUpdateID(trxnLogIndex); } try { 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 85dc33b18c44..c91b2af3dce4 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 @@ -116,8 +116,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } omClientResponse = new S3ExpiredMultipartUploadsAbortResponse( - omResponse.build(), abortedMultipartUploads, - ozoneManager.isRatisEnabled()); + omResponse.build(), abortedMultipartUploads + ); result = Result.SUCCESS; } catch (IOException ex) { @@ -230,8 +230,7 @@ private void updateTableCache(OzoneManager ozoneManager, omMetadataManager.getMultipartInfoTable().get(expiredMPUKeyName); if (omMultipartKeyInfo != null) { - if (ozoneManager.isRatisEnabled() && - trxnLogIndex < omMultipartKeyInfo.getUpdateID()) { + if (trxnLogIndex < omMultipartKeyInfo.getUpdateID()) { LOG.warn("Transaction log index {} is smaller than " + "the current updateID {} of MPU key {}, skipping deletion.", trxnLogIndex, omMultipartKeyInfo.getUpdateID(), @@ -240,8 +239,7 @@ private void updateTableCache(OzoneManager ozoneManager, } // Set the UpdateID to current transactionLogIndex - omMultipartKeyInfo.setUpdateID(trxnLogIndex, - ozoneManager.isRatisEnabled()); + omMultipartKeyInfo.setUpdateID(trxnLogIndex); // Parse the multipart upload components (e.g. volume, bucket, key) // from the multipartInfoTable db key 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 c44d95492c84..04f165048134 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 @@ -164,7 +164,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut multipartKeyInfo = omMetadataManager.getMultipartInfoTable() .get(multipartKey); - multipartKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + multipartKeyInfo.setUpdateID(trxnLogIndex); // When abort uploaded key, we need to subtract the PartKey length from // the volume usedBytes. @@ -244,7 +244,7 @@ protected OMClientResponse getOmClientResponse(OzoneManager ozoneManager, OMClientResponse omClientResponse = new S3MultipartUploadAbortResponse( omResponse.setAbortMultiPartUploadResponse( MultipartUploadAbortResponse.newBuilder()).build(), multipartKey, - multipartOpenKey, multipartKeyInfo, ozoneManager.isRatisEnabled(), + multipartOpenKey, multipartKeyInfo, omBucketInfo.copyObject(), getBucketLayout()); return omClientResponse; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java index 3fad0f1245fc..8de661f4b133 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java @@ -56,7 +56,7 @@ protected OMClientResponse getOmClientResponse(OzoneManager ozoneManager, OMClientResponse omClientResp = new S3MultipartUploadAbortResponseWithFSO( omResponse.setAbortMultiPartUploadResponse( MultipartUploadAbortResponse.newBuilder()).build(), multipartKey, - multipartOpenKey, multipartKeyInfo, ozoneManager.isRatisEnabled(), + multipartOpenKey, multipartKeyInfo, omBucketInfo.copyObject(), getBucketLayout()); return omClientResp; } 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 4997af5d7d5a..c76b731f0cda 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 @@ -176,7 +176,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Set Modification time omKeyInfo.setModificationTime(keyArgs.getModificationTime()); // Set the UpdateID to current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); int partNumber = keyArgs.getMultipartNumber(); partName = getPartName(ozoneKey, uploadID, partNumber); @@ -207,8 +207,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut multipartKeyInfo.addPartKeyInfo(partKeyInfo.build()); // Set the UpdateID to current transactionLogIndex - multipartKeyInfo.setUpdateID(trxnLogIndex, - ozoneManager.isRatisEnabled()); + multipartKeyInfo.setUpdateID(trxnLogIndex); // OldPartKeyInfo will be deleted. Its updateID will be set in // S3MultipartUploadCommitPartResponse before being added to @@ -292,7 +291,7 @@ protected S3MultipartUploadCommitPartResponse getOmClientResponse( return new S3MultipartUploadCommitPartResponse(build, multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo, - ozoneManager.isRatisEnabled(), omBucketInfo, getBucketLayout()); + omBucketInfo, getBucketLayout()); } protected OmKeyInfo getOmKeyInfo(OMMetadataManager omMetadataManager, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java index be65c2ff6053..c6549df31472 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java @@ -76,6 +76,6 @@ protected S3MultipartUploadCommitPartResponse getOmClientResponse( return new S3MultipartUploadCommitPartResponseWithFSO(build, multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo, - ozoneManager.isRatisEnabled(), omBucketInfo, getBucketLayout()); + omBucketInfo, getBucketLayout()); } } 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 17b96eaf9d90..033efd8cbbb6 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 @@ -297,7 +297,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // All parts have same replication information. Here getting from last // part. OmKeyInfo omKeyInfo = - getOmKeyInfo(ozoneManager, trxnLogIndex, keyArgs, volumeName, + getOmKeyInfo(trxnLogIndex, keyArgs, volumeName, bucketName, keyName, dbMultipartOpenKey, omMetadataManager, dbOzoneKey, partKeyInfoMap, partLocationInfos, dataSize); @@ -322,7 +322,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut boolean isNamespaceUpdate = false; if (keyToDelete != null && !omBucketInfo.getIsVersionEnabled()) { RepeatedOmKeyInfo oldKeyVersionsToDelete = getOldVersionsToCleanUp( - keyToDelete, trxnLogIndex, ozoneManager.isRatisEnabled()); + keyToDelete, trxnLogIndex); allKeyInfoToRemove.addAll(oldKeyVersionsToDelete.getOmKeyInfoList()); usedBytesDiff -= keyToDelete.getReplicatedSize(); } else { @@ -456,7 +456,7 @@ protected void logResult(OzoneManager ozoneManager, } @SuppressWarnings("checkstyle:ParameterNumber") - protected OmKeyInfo getOmKeyInfo(OzoneManager ozoneManager, long trxnLogIndex, + protected OmKeyInfo getOmKeyInfo(long trxnLogIndex, KeyArgs keyArgs, String volumeName, String bucketName, String keyName, String multipartOpenKey, OMMetadataManager omMetadataManager, String ozoneKey, OmMultipartKeyInfo.PartKeyInfoMap partKeyInfoMap, @@ -532,7 +532,7 @@ protected OmKeyInfo getOmKeyInfo(OzoneManager ozoneManager, long trxnLogIndex, omKeyInfo.setTags(dbOpenKeyInfo.getTags()); } } - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); return omKeyInfo; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequest.java index 9199494a4ea9..c6af6d1d8d6f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequest.java @@ -130,7 +130,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Clear / delete the tags omKeyInfo.getTags().clear(); // Set the UpdateID to the current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Note: Key modification time is not changed because S3 last modified // time only changes when there are changes in the object content diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequestWithFSO.java index f80c79e87280..d4b20536e2df 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteObjectTaggingRequestWithFSO.java @@ -115,7 +115,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Clear / delete the tags omKeyInfo.getTags().clear(); // Set the UpdateId to the current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Note: Key modification time is not changed because S3 last modified // time only changes when there are changes in the object content diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequest.java index 4cfbe68a1838..14f330751319 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequest.java @@ -132,7 +132,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.getTags().clear(); omKeyInfo.getTags().putAll(KeyValueUtil.getFromProtobuf(keyArgs.getTagsList())); // Set the UpdateID to the current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Note: Key modification time is not changed because S3 last modified // time only changes when there are changes in the object content diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequestWithFSO.java index a7b7c363f062..b39c15a6ea60 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3PutObjectTaggingRequestWithFSO.java @@ -117,7 +117,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omKeyInfo.getTags().clear(); omKeyInfo.getTags().putAll(KeyValueUtil.getFromProtobuf(keyArgs.getTagsList())); // Set the UpdateId to the current transactionLogIndex - omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omKeyInfo.setUpdateID(trxnLogIndex); // Note: Key modification time is not changed because S3 last modified // time only changes when there are changes in the object content 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 b68279683a53..9a313b6841d0 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 @@ -287,8 +287,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omVolumeArgs.setQuotaInNamespace(OzoneConsts.QUOTA_RESET); omVolumeArgs.setObjectID( ozoneManager.getObjectIdFromTxId(transactionLogIndex)); - omVolumeArgs.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omVolumeArgs.setUpdateID(transactionLogIndex); omVolumeArgs.incRefCount(); // Remove this check when vol ref count is also used by other features 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 f6cb32a45d59..22166c56f521 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 @@ -131,8 +131,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // ID will be set to transactionID each time we update the object. omVolumeArgs.setObjectID( ozoneManager.getObjectIdFromTxId(transactionLogIndex)); - omVolumeArgs.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omVolumeArgs.setUpdateID(transactionLogIndex); auditMap = omVolumeArgs.toAuditMap(); 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 090b01869742..a0a8bc1ebfa6 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 @@ -154,8 +154,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut // Set owner with new owner name. omVolumeArgs.setOwnerName(newOwner); - omVolumeArgs.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omVolumeArgs.setUpdateID(transactionLogIndex); // Update modificationTime. omVolumeArgs.setModificationTime( 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 2174acf63e6a..856619e4b4fa 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 @@ -143,8 +143,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut omVolumeArgs.setQuotaInNamespace(omVolumeArgs.getQuotaInNamespace()); } - omVolumeArgs.setUpdateID(transactionLogIndex, - ozoneManager.isRatisEnabled()); + omVolumeArgs.setUpdateID(transactionLogIndex); omVolumeArgs.setModificationTime( setVolumePropertyRequest.getModificationTime()); 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 5a83720e0b09..e279c45c9056 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 @@ -118,7 +118,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut } omVolumeArgs.setModificationTime(modificationTime); - omVolumeArgs.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled()); + omVolumeArgs.setUpdateID(trxnLogIndex); // update cache. omMetadataManager.getVolumeTable().addCacheEntry( diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java index febf4a44c3ed..549f74060dcb 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java @@ -43,30 +43,14 @@ @CleanupTableInfo(cleanupTables = {DELETED_TABLE}) public abstract class AbstractOMKeyDeleteResponse extends OmKeyResponse { - private boolean isRatisEnabled; - public AbstractOMKeyDeleteResponse( - @Nonnull OMResponse omResponse, boolean isRatisEnabled) { - + @Nonnull OMResponse omResponse) { super(omResponse); - this.isRatisEnabled = isRatisEnabled; } - public AbstractOMKeyDeleteResponse(@Nonnull OMResponse omResponse, - boolean isRatisEnabled, BucketLayout bucketLayout) { - - super(omResponse, bucketLayout); - this.isRatisEnabled = isRatisEnabled; - } - - /** - * For when the request is not successful. - * For a successful request, the other constructor should be used. - */ public AbstractOMKeyDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) { super(omResponse, bucketLayout); - checkStatusNotOK(); } /** @@ -99,8 +83,8 @@ protected void addDeletionToBatch( // if it is not null, then we simply add to the list and store this // instance in deletedTable. RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - omKeyInfo, omKeyInfo.getUpdateID(), - isRatisEnabled); + omKeyInfo, omKeyInfo.getUpdateID() + ); String delKeyName = omMetadataManager.getOzoneDeletePathKey( omKeyInfo.getObjectID(), keyName); omMetadataManager.getDeletedTable().putWithBatch( @@ -142,8 +126,8 @@ protected void addDeletionToBatch( // if it is not null, then we simply add to the list and store this // instance in deletedTable. RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - omKeyInfo, omKeyInfo.getUpdateID(), - isRatisEnabled); + omKeyInfo, omKeyInfo.getUpdateID() + ); omMetadataManager.getDeletedTable().putWithBatch( batchOperation, deleteKeyName, repeatedOmKeyInfo); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java index 782063d32446..547b2db04105 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java @@ -60,19 +60,17 @@ public class OMDirectoriesPurgeResponseWithFSO extends OmKeyResponse { LoggerFactory.getLogger(OMDirectoriesPurgeResponseWithFSO.class); private List paths; - private boolean isRatisEnabled; private Map, OmBucketInfo> volBucketInfoMap; private SnapshotInfo fromSnapshotInfo; private Map openKeyInfoMap; public OMDirectoriesPurgeResponseWithFSO(@Nonnull OMResponse omResponse, @Nonnull List paths, - boolean isRatisEnabled, @Nonnull BucketLayout bucketLayout, + @Nonnull BucketLayout bucketLayout, Map, OmBucketInfo> volBucketInfoMap, SnapshotInfo fromSnapshotInfo, Map openKeyInfoMap) { super(omResponse, bucketLayout); this.paths = paths; - this.isRatisEnabled = isRatisEnabled; this.volBucketInfoMap = volBucketInfoMap; this.fromSnapshotInfo = fromSnapshotInfo; this.openKeyInfoMap = openKeyInfoMap; @@ -158,7 +156,7 @@ public void processPaths(OMMetadataManager omMetadataManager, } RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - keyInfo, keyInfo.getUpdateID(), isRatisEnabled); + keyInfo, keyInfo.getUpdateID()); String deletedKey = omMetadataManager .getOzoneKey(keyInfo.getVolumeName(), keyInfo.getBucketName(), diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java index 7cdd2dc36b2c..fe19d09ab244 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java @@ -49,9 +49,9 @@ public class OMKeyDeleteResponse extends AbstractOMKeyDeleteResponse { private OmKeyInfo deletedOpenKeyInfo; public OMKeyDeleteResponse(@Nonnull OMResponse omResponse, - @Nonnull OmKeyInfo omKeyInfo, boolean isRatisEnabled, + @Nonnull OmKeyInfo omKeyInfo, @Nonnull OmBucketInfo omBucketInfo, OmKeyInfo deletedOpenKeyInfo) { - super(omResponse, isRatisEnabled, omBucketInfo.getBucketLayout()); + super(omResponse, omBucketInfo.getBucketLayout()); this.omKeyInfo = omKeyInfo; this.omBucketInfo = omBucketInfo; this.deletedOpenKeyInfo = deletedOpenKeyInfo; @@ -64,6 +64,7 @@ public OMKeyDeleteResponse(@Nonnull OMResponse omResponse, public OMKeyDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) { super(omResponse, bucketLayout); + checkStatusNotOK(); } @Override diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java index e428684a1695..2b9de62346aa 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java @@ -52,9 +52,9 @@ public class OMKeyDeleteResponseWithFSO extends OMKeyDeleteResponse { @SuppressWarnings("parameternumber") public OMKeyDeleteResponseWithFSO(@Nonnull OMResponse omResponse, @Nonnull String keyName, @Nonnull OmKeyInfo omKeyInfo, - boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo, + @Nonnull OmBucketInfo omBucketInfo, @Nonnull boolean isDeleteDirectory, @Nonnull long volumeId, OmKeyInfo deletedOpenKeyInfo) { - super(omResponse, omKeyInfo, isRatisEnabled, omBucketInfo, deletedOpenKeyInfo); + super(omResponse, omKeyInfo, omBucketInfo, deletedOpenKeyInfo); this.keyName = keyName; this.isDeleteDirectory = isDeleteDirectory; this.volumeId = volumeId; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java index 8cf7f6b9260f..82654c32d9b7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java @@ -51,9 +51,9 @@ public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse { public OMKeysDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull List keyDeleteList, - boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo, + @Nonnull OmBucketInfo omBucketInfo, @Nonnull Map openKeyInfoMap) { - super(omResponse, isRatisEnabled); + super(omResponse); this.omKeyInfoList = keyDeleteList; this.omBucketInfo = omBucketInfo; this.openKeyInfoMap = openKeyInfoMap; @@ -66,6 +66,7 @@ public OMKeysDeleteResponse(@Nonnull OMResponse omResponse, public OMKeysDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) { super(omResponse, bucketLayout); + checkStatusNotOK(); } @Override diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java index 861204c3938a..ec7f75e77291 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponseWithFSO.java @@ -51,10 +51,10 @@ public class OMKeysDeleteResponseWithFSO extends OMKeysDeleteResponse { public OMKeysDeleteResponseWithFSO( @Nonnull OzoneManagerProtocolProtos.OMResponse omResponse, @Nonnull List keyDeleteList, - @Nonnull List dirDeleteList, boolean isRatisEnabled, + @Nonnull List dirDeleteList, @Nonnull OmBucketInfo omBucketInfo, @Nonnull long volId, @Nonnull Map openKeyInfoMap) { - super(omResponse, keyDeleteList, isRatisEnabled, omBucketInfo, openKeyInfoMap); + super(omResponse, keyDeleteList, omBucketInfo, openKeyInfoMap); this.dirsList = dirDeleteList; this.volumeId = volId; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java index 1c34e1c66a04..c4a5c3011214 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java @@ -47,10 +47,9 @@ public class OMOpenKeysDeleteResponse extends AbstractOMKeyDeleteResponse { public OMOpenKeysDeleteResponse( @Nonnull OMResponse omResponse, @Nonnull Map keysToDelete, - boolean isRatisEnabled, @Nonnull BucketLayout bucketLayout) { - super(omResponse, isRatisEnabled, bucketLayout); + super(omResponse, bucketLayout); this.keysToDelete = keysToDelete; } @@ -63,6 +62,7 @@ public OMOpenKeysDeleteResponse( @Nonnull BucketLayout bucketLayout) { super(omResponse, bucketLayout); + checkStatusNotOK(); } @Override diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/AbstractS3MultipartAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/AbstractS3MultipartAbortResponse.java index 0b32561f34d7..fb930b8b4dae 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/AbstractS3MultipartAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/AbstractS3MultipartAbortResponse.java @@ -53,29 +53,14 @@ DELETED_TABLE, MULTIPARTINFO_TABLE, BUCKET_TABLE}) public abstract class AbstractS3MultipartAbortResponse extends OmKeyResponse { - private boolean isRatisEnabled; - public AbstractS3MultipartAbortResponse( - @Nonnull OMResponse omResponse, boolean isRatisEnabled) { + @Nonnull OMResponse omResponse) { super(omResponse); - this.isRatisEnabled = isRatisEnabled; } - public AbstractS3MultipartAbortResponse( - @Nonnull OMResponse omResponse, boolean isRatisEnabled, - BucketLayout bucketLayout) { - super(omResponse, bucketLayout); - this.isRatisEnabled = isRatisEnabled; - } - - /** - * For when the request is not successful. - * For a successful request, the other constructor should be used. - */ public AbstractS3MultipartAbortResponse(@Nonnull OMResponse omResponse, BucketLayout bucketLayout) { super(omResponse, bucketLayout); - checkStatusNotOK(); } /** @@ -112,8 +97,8 @@ protected void addAbortToBatch( // deletedTable if it does. RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - currentKeyPartInfo, omMultipartKeyInfo.getUpdateID(), - isRatisEnabled); + currentKeyPartInfo, omMultipartKeyInfo.getUpdateID() + ); // multi-part key format is volumeName/bucketName/keyName/uploadId String deleteKey = omMetadataManager.getOzoneDeletePathKey( diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java index d75c3b34665c..0e339ddfa540 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3ExpiredMultipartUploadsAbortResponse.java @@ -50,9 +50,8 @@ public class S3ExpiredMultipartUploadsAbortResponse extends public S3ExpiredMultipartUploadsAbortResponse( @Nonnull OMResponse omResponse, - @Nonnull Map> mpusToDelete, - boolean isRatisEnabled) { - super(omResponse, isRatisEnabled); + @Nonnull Map> mpusToDelete) { + super(omResponse); this.mpusToDelete = mpusToDelete; } @@ -65,6 +64,7 @@ public S3ExpiredMultipartUploadsAbortResponse( // Set BucketLayout.DEFAULT just as a placeholder // OmMultipartAbortInfo already contains the bucket layout info super(omResponse, BucketLayout.DEFAULT); + checkStatusNotOK(); } @Override diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java index 206398127720..0313e0af5924 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java @@ -50,9 +50,9 @@ public class S3MultipartUploadAbortResponse extends public S3MultipartUploadAbortResponse(@Nonnull OMResponse omResponse, String multipartKey, String multipartOpenKey, - @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, boolean isRatisEnabled, + @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) { - super(omResponse, isRatisEnabled, bucketLayout); + super(omResponse, bucketLayout); this.multipartKey = multipartKey; this.multipartOpenKey = multipartOpenKey; this.omMultipartKeyInfo = omMultipartKeyInfo; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java index 11bedef6d52d..892ff7a6d066 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java @@ -40,11 +40,11 @@ public class S3MultipartUploadAbortResponseWithFSO public S3MultipartUploadAbortResponseWithFSO(@Nonnull OMResponse omResponse, String multipartKey, String multipartOpenKey, - @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, boolean isRatisEnabled, + @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) { super(omResponse, multipartKey, multipartOpenKey, omMultipartKeyInfo, - isRatisEnabled, omBucketInfo, bucketLayout); + omBucketInfo, bucketLayout); } /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java index 8199c840d090..497239a87f94 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java @@ -58,7 +58,6 @@ public class S3MultipartUploadCommitPartResponse extends OmKeyResponse { private OmMultipartKeyInfo omMultipartKeyInfo; private OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo; private OmKeyInfo openPartKeyInfoToBeDeleted; - private boolean isRatisEnabled; private OmBucketInfo omBucketInfo; /** @@ -72,7 +71,6 @@ public class S3MultipartUploadCommitPartResponse extends OmKeyResponse { * @param omMultipartKeyInfo * @param oldPartKeyInfo * @param openPartKeyInfoToBeDeleted - * @param isRatisEnabled * @param omBucketInfo */ @SuppressWarnings("checkstyle:ParameterNumber") @@ -81,7 +79,7 @@ public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, @Nullable OmMultipartKeyInfo omMultipartKeyInfo, @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo, @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, - boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo, + @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) { super(omResponse, bucketLayout); this.multipartKey = multipartKey; @@ -89,7 +87,6 @@ public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, this.omMultipartKeyInfo = omMultipartKeyInfo; this.oldPartKeyInfo = oldPartKeyInfo; this.openPartKeyInfoToBeDeleted = openPartKeyInfoToBeDeleted; - this.isRatisEnabled = isRatisEnabled; this.omBucketInfo = omBucketInfo; } @@ -103,8 +100,8 @@ public void checkAndUpdateDB(OMMetadataManager omMetadataManager, RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete(openPartKeyInfoToBeDeleted, - openPartKeyInfoToBeDeleted.getUpdateID(), - isRatisEnabled); + openPartKeyInfoToBeDeleted.getUpdateID() + ); // multi-part key format is volumeName/bucketName/keyName/uploadId String deleteKey = omMetadataManager.getOzoneDeletePathKey( openPartKeyInfoToBeDeleted.getObjectID(), multipartKey); @@ -137,7 +134,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( partKeyToBeDeleted, - omMultipartKeyInfo.getUpdateID(), isRatisEnabled); + omMultipartKeyInfo.getUpdateID()); // multi-part key format is volumeName/bucketName/keyName/uploadId String deleteKey = omMetadataManager.getOzoneDeletePathKey( partKeyToBeDeleted.getObjectID(), multipartKey); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java index ed2ae34b310e..56c15e3edc78 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java @@ -52,7 +52,6 @@ public class S3MultipartUploadCommitPartResponseWithFSO * @param omMultipartKeyInfo * @param oldPartKeyInfo * @param openPartKeyInfoToBeDeleted - * @param isRatisEnabled * @param omBucketInfo */ @SuppressWarnings("checkstyle:ParameterNumber") @@ -60,11 +59,11 @@ public S3MultipartUploadCommitPartResponseWithFSO( @Nonnull OMResponse omResponse, String multipartKey, String openKey, @Nullable OmMultipartKeyInfo omMultipartKeyInfo, @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo, - @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, boolean isRatisEnabled, + @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) { super(omResponse, multipartKey, openKey, omMultipartKeyInfo, - oldPartKeyInfo, openPartKeyInfoToBeDeleted, isRatisEnabled, + oldPartKeyInfo, openPartKeyInfoToBeDeleted, omBucketInfo, bucketLayout); } } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java index dc685424886c..81c9342517da 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java @@ -80,7 +80,6 @@ public void setup() throws Exception { when(lvm.getMetadataLayoutVersion()).thenReturn(0); when(lvm.isAllowed(anyString())).thenReturn(true); when(ozoneManager.getVersionManager()).thenReturn(lvm); - when(ozoneManager.isRatisEnabled()).thenReturn(true); auditLogger = mock(AuditLogger.class); when(ozoneManager.getAuditLogger()).thenReturn(auditLogger); doNothing().when(auditLogger).logWrite(any(AuditMessage.class)); 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 6e24c9ff93f8..253e39aefcca 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 @@ -137,7 +137,6 @@ public void setup() throws IOException { .setOmMetadataManager(omMetadataManager) .setS3SecretManager(secretManager) .setMaxUnFlushedTransactionCount(1000) - .enableRatis(true) .setFlushNotifier(spyFlushNotifier) .build() .start(); 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 22272182997e..71bf5eb79812 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 @@ -77,7 +77,6 @@ public void setup() throws IOException { doubleBuffer = OzoneManagerDoubleBuffer.newBuilder() .setOmMetadataManager(omMetadataManager) .setMaxUnFlushedTransactionCount(10000) - .enableRatis(true) .build() .start(); } 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 6b9f93e08c91..4b32ea23ee66 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 @@ -114,7 +114,6 @@ public void setup() throws IOException { doubleBuffer = OzoneManagerDoubleBuffer.newBuilder() .setOmMetadataManager(omMetadataManager) .setMaxUnFlushedTransactionCount(100000) - .enableRatis(true) .build() .start(); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java index eff23a18e6e2..b69776781056 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java @@ -982,7 +982,7 @@ public static String deleteKey(String ozoneKey, omMetadataManager.getKeyTable(getDefaultBucketLayout()).delete(ozoneKey); RepeatedOmKeyInfo repeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - omKeyInfo, trxnLogIndex, true); + omKeyInfo, trxnLogIndex); omMetadataManager.getDeletedTable().put(ozoneKey, repeatedOmKeyInfo); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java index a7cdd2d6c53e..d511c70dcca3 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java @@ -71,7 +71,6 @@ public void setup() throws Exception { ozoneManager); when(ozoneManager.getMetrics()).thenReturn(omMetrics); when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); - when(ozoneManager.isRatisEnabled()).thenReturn(true); when(ozoneManager.getOMDefaultBucketLayout()).thenReturn( BucketLayout.fromString( OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT_DEFAULT)); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java index 547cdbe895d0..5853e818325e 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java @@ -159,7 +159,6 @@ public void setup() throws Exception { OMLayoutVersionManager lvm = mock(OMLayoutVersionManager.class); when(lvm.isAllowed(anyString())).thenReturn(true); when(ozoneManager.getVersionManager()).thenReturn(lvm); - when(ozoneManager.isRatisEnabled()).thenReturn(true); when(ozoneManager.isFilesystemSnapshotEnabled()).thenReturn(true); auditLogger = mock(AuditLogger.class); when(ozoneManager.getAuditLogger()).thenReturn(auditLogger); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java index a66dd1aa7df5..a539624f146f 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java @@ -38,7 +38,6 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils; -import org.apache.hadoop.ozone.om.helpers.WithObjectID; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; @@ -199,7 +198,7 @@ public void testDeleteSameKeyNameDifferentClient( * Tests removing keys from the open key table cache that have higher * updateID than the transactionID. Those keys should be ignored. * It is OK if updateID equals to or less than transactionID. - * See {@link WithObjectID#setUpdateID(long, boolean)}. + * See {@link #setUpdateID(long)}. * * @throws Exception */ diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java index 0220afbc60c8..86b20ed35173 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java @@ -45,7 +45,6 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; -import org.apache.hadoop.ozone.om.helpers.WithObjectID; import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; @@ -165,7 +164,7 @@ public void testAbortSubsetOfMPUs( * Tests removing MPUs from the multipart info table cache that have higher * updateID than the transactionID. Those MPUs should be ignored. * It is OK if updateID equals to or less than transactionID. - * See {@link WithObjectID#setUpdateID(long, boolean)}. + * See {@link #setUpdateID(long)}. * * @throws Exception */ diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java index ff9206675397..6b6a1cb8e503 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java @@ -114,7 +114,6 @@ public void setup() throws Exception { OMLayoutVersionManager lvm = mock(OMLayoutVersionManager.class); when(lvm.getMetadataLayoutVersion()).thenReturn(0); when(ozoneManager.getVersionManager()).thenReturn(lvm); - when(ozoneManager.isRatisEnabled()).thenReturn(true); when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java index 9c80a05c1272..4d318138d5f1 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java @@ -147,7 +147,6 @@ public void setUp() throws Exception { ozoneManager); when(ozoneManager.getMetrics()).thenReturn(omMetrics); when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); - when(ozoneManager.isRatisEnabled()).thenReturn(true); S3SecretLockedManager secretManager = new S3SecretLockedManager( new S3SecretManagerImpl( omMetadataManager, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java index 5e0d2db17c9b..603df134ceda 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java @@ -77,7 +77,6 @@ public void setup() throws Exception { OMLayoutVersionManager lvm = mock(OMLayoutVersionManager.class); when(lvm.getMetadataLayoutVersion()).thenReturn(0); when(ozoneManager.getVersionManager()).thenReturn(lvm); - when(ozoneManager.isRatisEnabled()).thenReturn(true); auditLogger = mock(AuditLogger.class); when(ozoneManager.getAuditLogger()).thenReturn(auditLogger); doNothing().when(auditLogger).logWrite(any(AuditMessage.class)); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java index 762401bc57bf..aecc100d4965 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java @@ -118,7 +118,7 @@ public void testAddToDBBatchNoOp() throws Exception { public void testAddToDBBatchOnOverwrite() throws Exception { OmKeyInfo omKeyInfo = getOmKeyInfo(); keysToDelete = - OmUtils.prepareKeyForDelete(omKeyInfo, 100, false); + OmUtils.prepareKeyForDelete(omKeyInfo, 100); assertNotNull(keysToDelete); testAddToDBBatch(); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java index 8031ead68f18..ee8bccf0920a 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java @@ -171,7 +171,7 @@ protected String addKeyToTable() throws Exception { protected OMKeyDeleteResponse getOmKeyDeleteResponse(OmKeyInfo omKeyInfo, OzoneManagerProtocolProtos.OMResponse omResponse) throws Exception { - return new OMKeyDeleteResponse(omResponse, omKeyInfo, true, omBucketInfo, null); + return new OMKeyDeleteResponse(omResponse, omKeyInfo, omBucketInfo, null); } protected OmBucketInfo getOmBucketInfo() { diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java index 38f5438e9877..990781c71cd5 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java @@ -36,7 +36,7 @@ public class TestOMKeyDeleteResponseWithFSO extends TestOMKeyDeleteResponse { protected OMKeyDeleteResponse getOmKeyDeleteResponse(OmKeyInfo omKeyInfo, OzoneManagerProtocolProtos.OMResponse omResponse) throws Exception { return new OMKeyDeleteResponseWithFSO(omResponse, omKeyInfo.getKeyName(), - omKeyInfo, true, getOmBucketInfo(), false, + omKeyInfo, getOmBucketInfo(), false, omMetadataManager.getVolumeId(volumeName), null); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java index e7689e52ed7d..debd30b3b695 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java @@ -104,7 +104,7 @@ public void testKeysDeleteResponse() throws Exception { protected OMClientResponse getOmKeysDeleteResponse(OMResponse omResponse, OmBucketInfo omBucketInfo) { return new OMKeysDeleteResponse( - omResponse, omKeyInfoList, true, omBucketInfo, Collections.emptyMap()); + omResponse, omKeyInfoList, omBucketInfo, Collections.emptyMap()); } @Test diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java index 13e706757f92..b6a4045e77dd 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java @@ -111,7 +111,7 @@ protected void createPreRequisities() throws Exception { protected OMClientResponse getOmKeysDeleteResponse(OMResponse omResponse, OmBucketInfo omBucketInfo) { return new OMKeysDeleteResponseWithFSO( - omResponse, getOmKeyInfoList(), dirDeleteList, true, omBucketInfo, + omResponse, getOmKeyInfoList(), dirDeleteList, omBucketInfo, volId, Collections.emptyMap()); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java index c9a4109809ed..a3ebcdb327be 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java @@ -168,7 +168,7 @@ private void createAndCommitResponse(Map keysToDelete, .build(); OMOpenKeysDeleteResponse response = new OMOpenKeysDeleteResponse(omResponse, - keysToDelete, true, getBucketLayout()); + keysToDelete, getBucketLayout()); // Operations are only added to the batch by this method when status is OK. response.checkAndUpdateDB(omMetadataManager, batchOperation); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java index 35600c331f3f..2c4196d7e05a 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java @@ -241,7 +241,7 @@ private void createAndCommitResponse( .build(); S3ExpiredMultipartUploadsAbortResponse response = new - S3ExpiredMultipartUploadsAbortResponse(omResponse, mpusToAbort, true); + S3ExpiredMultipartUploadsAbortResponse(omResponse, mpusToAbort); // Operations are only added to the batch by this method when status is OK response.checkAndUpdateDB(omMetadataManager, batchOperation); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java index a2192ddb880c..f96fa9310856 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java @@ -264,7 +264,6 @@ public S3MultipartUploadCommitPartResponse createS3CommitMPUResponseFSO( String multipartKey = omMetadataManager .getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); - boolean isRatisEnabled = true; String bucketKey = omMetadataManager.getBucketKey(volumeName, bucketName); OmBucketInfo omBucketInfo = omMetadataManager.getBucketTable().get(bucketKey); @@ -291,7 +290,7 @@ public S3MultipartUploadCommitPartResponse createS3CommitMPUResponseFSO( return new S3MultipartUploadCommitPartResponseWithFSO(omResponse, multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo, - openPartKeyInfoToBeDeleted, isRatisEnabled, omBucketInfo, + openPartKeyInfoToBeDeleted, omBucketInfo, getBucketLayout()); } @@ -342,7 +341,7 @@ protected S3MultipartUploadAbortResponse getS3MultipartUploadAbortResp( OmMultipartKeyInfo omMultipartKeyInfo, OmBucketInfo omBucketInfo, OMResponse omResponse) { return new S3MultipartUploadAbortResponse(omResponse, multipartKey, - multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo, + multipartOpenKey, omMultipartKeyInfo, omBucketInfo, getBucketLayout()); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java index 7a98ec3c3ab3..cd0ff8778089 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java @@ -99,7 +99,7 @@ protected S3MultipartUploadAbortResponse getS3MultipartUploadAbortResp( OmMultipartKeyInfo omMultipartKeyInfo, OmBucketInfo omBucketInfo, OzoneManagerProtocolProtos.OMResponse omResponse) { return new S3MultipartUploadAbortResponseWithFSO(omResponse, multipartKey, - multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo, + multipartOpenKey, omMultipartKeyInfo, omBucketInfo, getBucketLayout()); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java index b037b68fd72b..9157b6d195ec 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java @@ -148,7 +148,6 @@ public void baseSetup() throws Exception { i.getArgument(0), "dummyBucketOwner", BucketLayout.FILE_SYSTEM_OPTIMIZED)); when(ozoneManager.getMetrics()).thenReturn(omMetrics); when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); - when(ozoneManager.isRatisEnabled()).thenReturn(true); when(ozoneManager.isFilesystemSnapshotEnabled()).thenReturn(true); when(ozoneManager.isAdmin(any())).thenReturn(isAdmin); when(ozoneManager.isOwner(any(), any())).thenReturn(false); diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java index 7e22536a1b00..091b19893e64 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java @@ -401,7 +401,7 @@ protected void markFileForDeletion(String fileKey, OmKeyInfo fileInfo) throws IO RepeatedOmKeyInfo originalRepeatedKeyInfo = deletedTable.get(fileKey); RepeatedOmKeyInfo updatedRepeatedOmKeyInfo = OmUtils.prepareKeyForDelete( - fileInfo, fileInfo.getUpdateID(), true); + fileInfo, fileInfo.getUpdateID()); // NOTE: The FSO code seems to write the open key entry with the whole // path, using the object's names instead of their ID. This would only // be possible when the file is deleted explicitly, and not part of a