This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ef980cd8292 HDDS-14227. Introduce factory method for RDBBatchOperation
(#9545)
ef980cd8292 is described below
commit ef980cd8292d21554581b78e30127b7c1b6665d3
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 22 18:55:21 2025 +0100
HDDS-14227. Introduce factory method for RDBBatchOperation (#9545)
---
.../apache/hadoop/hdds/utils/db/RDBBatchOperation.java | 16 ++++++++++------
.../java/org/apache/hadoop/hdds/utils/db/RDBStore.java | 2 +-
.../hadoop/hdds/utils/db/TestRDBBatchOperation.java | 2 +-
.../hdds/scm/ha/SCMHADBTransactionBufferStub.java | 2 +-
.../org/apache/hadoop/ozone/recon/TestReconTasks.java | 6 +++---
.../apache/hadoop/ozone/om/TestOmSnapshotManager.java | 8 ++++----
.../spi/impl/OzoneManagerServiceProviderImpl.java | 2 +-
.../ozone/recon/tasks/ContainerKeyMapperHelper.java | 2 +-
.../ozone/recon/tasks/FileSizeCountTaskHelper.java | 2 +-
.../ozone/recon/tasks/NSSummaryTaskDbEventHandler.java | 2 +-
.../hadoop/ozone/recon/tasks/OmTableInsightTask.java | 2 +-
.../hadoop/ozone/recon/api/TestContainerEndpoint.java | 4 ++--
.../impl/TestReconContainerMetadataManagerImpl.java | 18 +++++++++---------
.../spi/impl/TestReconNamespaceSummaryManagerImpl.java | 2 +-
.../ozone/recon/tasks/AbstractNSSummaryTaskTest.java | 2 +-
15 files changed, 38 insertions(+), 34 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBBatchOperation.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBBatchOperation.java
index f7b025ed98f..49693bd2967 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBBatchOperation.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBBatchOperation.java
@@ -49,7 +49,7 @@
* Note that a {@link RDBBatchOperation} object only for one batch.
* Also, this class is not threadsafe.
*/
-public class RDBBatchOperation implements BatchOperation {
+public final class RDBBatchOperation implements BatchOperation {
static final Logger LOG = LoggerFactory.getLogger(RDBBatchOperation.class);
private static final AtomicInteger BATCH_COUNT = new AtomicInteger();
@@ -62,6 +62,14 @@ public class RDBBatchOperation implements BatchOperation {
private enum Op { DELETE, PUT, DELETE_RANGE }
+ public static RDBBatchOperation newAtomicOperation() {
+ return newAtomicOperation(new ManagedWriteBatch());
+ }
+
+ public static RDBBatchOperation newAtomicOperation(ManagedWriteBatch
writeBatch) {
+ return new RDBBatchOperation(writeBatch);
+ }
+
private static void debug(Supplier<String> message) {
if (LOG.isTraceEnabled()) {
LOG.trace("\n{}", message.get());
@@ -627,11 +635,7 @@ String getCommitString() {
}
}
- public RDBBatchOperation() {
- writeBatch = new ManagedWriteBatch();
- }
-
- public RDBBatchOperation(ManagedWriteBatch writeBatch) {
+ private RDBBatchOperation(ManagedWriteBatch writeBatch) {
this.writeBatch = writeBatch;
}
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
index c833fed6ab4..efccdf31aef 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
@@ -274,7 +274,7 @@ public long getEstimatedKeyCount() throws
RocksDatabaseException {
@Override
public BatchOperation initBatchOperation() {
- return new RDBBatchOperation();
+ return RDBBatchOperation.newAtomicOperation();
}
@Override
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBBatchOperation.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBBatchOperation.java
index bbf53b9a960..bd33ab070ce 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBBatchOperation.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBBatchOperation.java
@@ -80,7 +80,7 @@ public void testBatchOperationWithDeleteRange() throws
RocksDatabaseException {
}).when(writeBatch).delete(Mockito.any(ColumnFamilyHandle.class),
Mockito.any(byte[].class));
});
- RDBBatchOperation batchOperation = new RDBBatchOperation()) {
+ RDBBatchOperation batchOperation =
RDBBatchOperation.newAtomicOperation()) {
ColumnFamilyHandle columnFamilyHandle =
Mockito.mock(ColumnFamilyHandle.class);
RocksDatabase.ColumnFamily columnFamily =
Mockito.mock(RocksDatabase.ColumnFamily.class);
doAnswer((i) -> {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferStub.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferStub.java
index 3e7803407f0..2e7b3fdb0dd 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferStub.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferStub.java
@@ -49,7 +49,7 @@ private BatchOperation getCurrentBatchOperation() {
if (dbStore != null) {
currentBatchOperation = dbStore.initBatchOperation();
} else {
- currentBatchOperation = new RDBBatchOperation();
+ currentBatchOperation = RDBBatchOperation.newAtomicOperation();
}
}
return currentBatchOperation;
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java
index ed0ddde04c9..3de70d66570 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java
@@ -148,7 +148,7 @@ public void testMissingContainerDownNode() throws Exception
{
.allocateContainer(RatisReplicationConfig.getInstance(ONE),
"test");
long containerID = containerInfo.getContainerID();
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerID, 2L);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
@@ -264,7 +264,7 @@ public void testEmptyMissingContainerDownNode() throws
Exception {
// Now add a container to key mapping count as 3. This data is used to
// identify if container is empty in terms of keys mapped to container.
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerID, 3L);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
@@ -302,7 +302,7 @@ public void testEmptyMissingContainerDownNode() throws
Exception {
// Now remove keys from container. This data is used to
// identify if container is empty in terms of keys mapped to container.
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerID, 0L);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
index dd7195802ed..fc4e5b7408d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
@@ -223,7 +223,7 @@ public void testCloseOnEviction() throws IOException,
snapshotChainManager.addSnapshot(first);
snapshotChainManager.addSnapshot(second);
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
// create the first snapshot checkpoint
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first, rdbBatchOperation);
@@ -238,7 +238,7 @@ public void testCloseOnEviction() throws IOException,
firstSnapshot.getMetadataManager(), "store", firstSnapshotStore);
// create second snapshot checkpoint (which will be used for eviction)
- rdbBatchOperation = new RDBBatchOperation();
+ rdbBatchOperation = RDBBatchOperation.newAtomicOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
second, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);
@@ -749,7 +749,7 @@ public void testCreateSnapshotIdempotent() throws Exception
{
when(snapshotInfoTable.get(first.getTableKey())).thenReturn(first);
// Create first checkpoint for the snapshot checkpoint
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);
@@ -758,7 +758,7 @@ public void testCreateSnapshotIdempotent() throws Exception
{
logCapturer.clearOutput();
// Create checkpoint again for the same snapshot.
- rdbBatchOperation = new RDBBatchOperation();
+ rdbBatchOperation = RDBBatchOperation.newAtomicOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
index d4edd2894f9..dca33c759b8 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
@@ -656,7 +656,7 @@ ImmutablePair<Boolean, Long>
innerGetAndApplyDeltaUpdatesFromOM(long fromSequenc
writeBatch.iterate(omdbUpdatesHandler);
// Commit the OM DB transactions in recon rocks DB and sync here.
try (RDBBatchOperation rdbBatchOperation =
- new RDBBatchOperation(writeBatch)) {
+ RDBBatchOperation.newAtomicOperation(writeBatch)) {
try (ManagedWriteOptions wOpts = new ManagedWriteOptions()) {
rdbBatchOperation.commit(rocksDB, wOpts);
}
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
index 626376ac09a..3e60ceceb6b 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
@@ -430,7 +430,7 @@ private static void writeToTheDB(Map<ContainerKeyPrefix,
Integer> localContainer
ReconContainerMetadataManager
reconContainerMetadataManager)
throws IOException {
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
// Write container key mappings (local per-task data)
localContainerKeyMap.keySet().forEach((ContainerKeyPrefix key) -> {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTaskHelper.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTaskHelper.java
index b82fcd556a1..4981083b502 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTaskHelper.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/FileSizeCountTaskHelper.java
@@ -274,7 +274,7 @@ public static void writeCountsToDB(Map<FileSizeCountKey,
Long> fileSizeCountMap,
return;
}
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
for (Map.Entry<FileSizeCountKey, Long> entry :
fileSizeCountMap.entrySet()) {
FileSizeCountKey key = entry.getKey();
Long deltaCount = entry.getValue();
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java
index 974c109bb42..3569bae71a1 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskDbEventHandler.java
@@ -61,7 +61,7 @@ public ReconOMMetadataManager getReconOMMetadataManager() {
private void updateNSSummariesToDB(Map<Long, NSSummary> nsSummaryMap,
Collection<Long> objectIdsToBeDeleted)
throws IOException {
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
for (Map.Entry<Long, NSSummary> entry : nsSummaryMap.entrySet()) {
try {
reconNamespaceSummaryManager.batchStoreNSSummaries(rdbBatchOperation,
entry.getKey(), entry.getValue());
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmTableInsightTask.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmTableInsightTask.java
index 8027966231d..59862cebb81 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmTableInsightTask.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmTableInsightTask.java
@@ -352,7 +352,7 @@ private void handleUpdateEvent(OMDBUpdateEvent<String,
Object> event,
* @param dataMap Map containing the updated count and size information.
*/
private void writeDataToDB(Map<String, Long> dataMap) {
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
for (Entry<String, Long> entry : dataMap.entrySet()) {
String key = entry.getKey();
Long value = entry.getValue();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
index 801177d25c4..a1b62acd63d 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
@@ -1469,7 +1469,7 @@ public void testGetContainerInsightsNonOMContainers()
.stream().map(entry -> entry.getKey()).collect(
Collectors.toList());
deletedContainerKeyList.forEach((ContainerKeyPrefix key) -> {
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
reconContainerMetadataManager
.batchDeleteContainerMapping(rdbBatchOperation, key);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
@@ -1506,7 +1506,7 @@ public void
testGetContainerInsightsNonOMContainersWithPrevKey()
reconContainerMetadataManager.getKeyPrefixesForContainer(2).entrySet()
.stream().map(entry ->
entry.getKey()).collect(Collectors.toList());
deletedContainerKeyList.forEach((ContainerKeyPrefix key) -> {
- try (RDBBatchOperation rdbBatchOperation = new RDBBatchOperation()) {
+ try (RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation()) {
reconContainerMetadataManager.batchDeleteContainerMapping(
rdbBatchOperation, key);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
index 0a3d9429a7c..22c3d6da4f4 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
@@ -80,7 +80,7 @@ public void setUp() throws Exception {
private void populateKeysInContainers(long containerId1, long containerId2)
throws Exception {
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
ContainerKeyPrefix containerKeyPrefix1 = ContainerKeyPrefix.get(
containerId1, keyPrefix1, 0);
reconContainerMetadataManager
@@ -119,7 +119,7 @@ public void testInitNewContainerDB() throws Exception {
"V1/B2/K3", 0);
prefixCounts.put(ckp3, 3);
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
for (Map.Entry<ContainerKeyPrefix, Integer> entry :
prefixCounts.entrySet()) {
reconContainerMetadataManager.batchStoreContainerKeyMapping(
@@ -164,7 +164,7 @@ public void testBatchStoreContainerKeyMapping() throws
Exception {
prefixCounts.put(keyPrefix2, 2);
prefixCounts.put(keyPrefix3, 3);
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
for (Map.Entry<String, Integer> entry : prefixCounts.entrySet()) {
ContainerKeyPrefix containerKeyPrefix = ContainerKeyPrefix.get(
containerId, entry.getKey(), 0);
@@ -192,7 +192,7 @@ public void testBatchStoreContainerKeyMapping() throws
Exception {
public void testStoreContainerKeyCount() throws Exception {
long containerId = 1L;
long nextContainerId = 2L;
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerId, 2L);
reconContainerMetadataManager
@@ -204,7 +204,7 @@ public void testStoreContainerKeyCount() throws Exception {
assertEquals(3,
reconContainerMetadataManager.getKeyCountForContainer(nextContainerId));
- RDBBatchOperation rdbBatchOperation2 = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation2 =
RDBBatchOperation.newAtomicOperation();
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation2, containerId, 20L);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation2);
@@ -216,7 +216,7 @@ public void testStoreContainerKeyCount() throws Exception {
public void testGetKeyCountForContainer() throws Exception {
long containerId = 1L;
long nextContainerId = 2L;
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerId, 2L);
reconContainerMetadataManager
@@ -236,7 +236,7 @@ public void testGetKeyCountForContainer() throws Exception {
public void testDoesContainerExists() throws Exception {
long containerId = 1L;
long nextContainerId = 2L;
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
reconContainerMetadataManager
.batchStoreContainerKeyCounts(rdbBatchOperation, containerId, 2L);
reconContainerMetadataManager
@@ -254,7 +254,7 @@ public void testDoesContainerExists() throws Exception {
public void testGetCountForContainerKeyPrefix() throws Exception {
long containerId = System.currentTimeMillis();
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
reconContainerMetadataManager.batchStoreContainerKeyMapping(
rdbBatchOperation, ContainerKeyPrefix.get(containerId, keyPrefix1), 2);
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
@@ -413,7 +413,7 @@ public void testDeleteContainerMapping() throws Exception {
}
});
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
ContainerKeyPrefix prefixForDelete = ContainerKeyPrefix.get(
containerId, keyPrefix2, 0);
reconContainerMetadataManager
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
index b4e62e9d03c..339e4160c31 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
@@ -114,7 +114,7 @@ private void putThreeNSMetadata() throws IOException {
hmap.put(1L, new NSSummary(1, 2, 2 * 3, testBucket, TEST_CHILD_DIR,
"dir1", -1));
hmap.put(2L, new NSSummary(3, 4, 4 * 3, testBucket, TEST_CHILD_DIR,
"dir2", -1));
hmap.put(3L, new NSSummary(5, 6, 6 * 3, testBucket, TEST_CHILD_DIR,
"dir3", -1));
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
for (Map.Entry entry: hmap.entrySet()) {
reconNamespaceSummaryManager.batchStoreNSSummaries(rdbBatchOperation,
(long)entry.getKey(), (NSSummary)entry.getValue());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
index fe461e18857..833ca449b43 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
@@ -159,7 +159,7 @@ public List<NSSummary> commonSetUpTestReprocess(Runnable
reprocessTask, long...
List<NSSummary> result = new ArrayList<>();
NSSummary staleNSSummary = new NSSummary();
- RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
+ RDBBatchOperation rdbBatchOperation =
RDBBatchOperation.newAtomicOperation();
getReconNamespaceSummaryManager().batchStoreNSSummaries(rdbBatchOperation,
-1L, staleNSSummary);
getReconNamespaceSummaryManager().commitBatchOperation(rdbBatchOperation);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
