Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.hadoop.hdds.utils.db.ByteArrayCodec;
import org.apache.hadoop.hdds.utils.db.CodecBuffer;
import org.apache.hadoop.hdds.utils.db.CodecBufferCodec;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.RDBBatchOperation;
import org.apache.hadoop.hdds.utils.db.StringCodec;
Expand Down Expand Up @@ -177,9 +179,9 @@ private boolean usesNonStringKeys(String tableName) {
private void processTableSequentially(String tableName, OMMetadataManager omMetadataManager) throws IOException {
LOG.info("{}: Processing table {} sequentially (non-String keys)", getTaskName(), tableName);

Table<byte[], byte[]> table = omMetadataManager.getStore()
.getTable(tableName, ByteArrayCodec.get(), ByteArrayCodec.get(), TableCache.CacheType.NO_CACHE);
try (TableIterator<byte[], byte[]> keyIterator = table.keyIterator()) {
Table<CodecBuffer, CodecBuffer> table = omMetadataManager.getStore()
.getTable(tableName, CodecBufferCodec.get(true), CodecBufferCodec.get(true), TableCache.CacheType.NO_CACHE);
try (TableIterator<CodecBuffer, CodecBuffer> keyIterator = table.keyIterator()) {
long count = Iterators.size(keyIterator);
objectCountMap.put(getTableCountKeyFromTable(tableName), count);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.recon.tasks;

import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.BUCKET_TABLE;
import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELEGATION_TOKEN_TABLE;
import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_DIR_TABLE;
import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.DELETED_TABLE;
import static org.apache.hadoop.ozone.om.codec.OMDBDefinition.KEY_TABLE;
Expand Down Expand Up @@ -48,16 +49,21 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.utils.db.CodecBuffer;
import org.apache.hadoop.hdds.utils.db.CodecBufferCodec;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.hdds.utils.db.TypedTable;
import org.apache.hadoop.hdds.utils.db.cache.TableCache;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
Expand Down Expand Up @@ -861,4 +867,41 @@ private OmKeyInfo getOmKeyInfo(String volumeName, String bucketName,
.setObjectID(objectID)
.build();
}

@Test
public void testSequentialProcessingWithCodecBuffer()
throws Exception {
OmTableInsightTask task =
new OmTableInsightTask(reconGlobalStatsManager, reconOMMetadataManager) {
@Override
public Collection<String> getTaskTables() {
return Collections.singletonList(DELEGATION_TOKEN_TABLE);
}
};
OMMetadataManager omMetadataManager = mock(OMMetadataManager.class);
DBStore store = mock(DBStore.class);
when(omMetadataManager.getStore()).thenReturn(store);
@SuppressWarnings("unchecked")
Table<CodecBuffer, CodecBuffer> table =
(Table<CodecBuffer, CodecBuffer>) mock(Table.class);
@SuppressWarnings("unchecked")
TableIterator<CodecBuffer, CodecBuffer> iterator =
(TableIterator<CodecBuffer, CodecBuffer>) mock(TableIterator.class);
when(store.getTable(
eq(DELEGATION_TOKEN_TABLE),
any(CodecBufferCodec.class),
any(CodecBufferCodec.class),
eq(TableCache.CacheType.NO_CACHE)))
.thenReturn((Table) table);
when(table.keyIterator()).thenReturn(iterator);
when(iterator.hasNext()).thenReturn(true, true, true, false);
ReconOmTask.TaskResult result = task.reprocess(omMetadataManager);
assertTrue(result.isTaskSuccess(),
"Sequential processing should succeed");
String countKey =
OmTableInsightTask.getTableCountKeyFromTable(DELEGATION_TOKEN_TABLE);
Long count = task.initializeCountMap().get(countKey);
assertEquals(3L, count,
"Sequential iterator must count all keys");
}
}