[
https://issues.apache.org/jira/browse/HDDS-1986?focusedWorklogId=324798&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-324798
]
ASF GitHub Bot logged work on HDDS-1986:
----------------------------------------
Author: ASF GitHub Bot
Created on: 08/Oct/19 01:35
Start Date: 08/Oct/19 01:35
Worklog Time Spent: 10m
Work Description: arp7 commented on pull request #1588: HDDS-1986. Fix
listkeys API.
URL: https://github.com/apache/hadoop/pull/1588#discussion_r332304634
##########
File path:
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
##########
@@ -0,0 +1,298 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+
+package org.apache.hadoop.ozone.om;
+import com.google.common.base.Optional;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.StorageType;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
+import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
+import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.util.List;
+import java.util.TreeSet;
+
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_DIRS;
+
+/**
+ * Tests OzoneManager MetadataManager.
+ */
+public class TestOmMetadataManager {
+
+ private OMMetadataManager omMetadataManager;
+ private OzoneConfiguration ozoneConfiguration;
+
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder();
+
+
+ @Before
+ public void setup() throws Exception {
+ ozoneConfiguration = new OzoneConfiguration();
+ ozoneConfiguration.set(OZONE_OM_DB_DIRS,
+ folder.getRoot().getAbsolutePath());
+ omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration);
+ }
+ @Test
+ public void testListKeys() throws Exception {
+
+ String volumeNameA = "volumeA";
+ String volumeNameB = "volumeB";
+ String ozoneBucket = "ozoneBucket";
+ String hadoopBucket = "hadoopBucket";
+
+
+ // Create volumes and buckets.
+ TestOMRequestUtils.addVolumeToDB(volumeNameA, omMetadataManager);
+ TestOMRequestUtils.addVolumeToDB(volumeNameB, omMetadataManager);
+ addBucketsToCache(volumeNameA, ozoneBucket);
+ addBucketsToCache(volumeNameB, hadoopBucket);
+
+
+ String prefixKeyA = "key-a";
+ String prefixKeyB = "key-b";
+ TreeSet<String> keysASet = new TreeSet<>();
+ TreeSet<String> keysBSet = new TreeSet<>();
+ for (int i=1; i<= 100; i++) {
+ if (i % 2 == 0) {
+ keysASet.add(
+ prefixKeyA + i);
+ addKeysToOM(volumeNameA, ozoneBucket, prefixKeyA + i, i);
+ } else {
+ keysBSet.add(
+ prefixKeyB + i);
+ addKeysToOM(volumeNameA, hadoopBucket, prefixKeyB + i, i);
+ }
+ }
+
+
+ TreeSet<String> keysAVolumeBSet = new TreeSet<>();
+ TreeSet<String> keysBVolumeBSet = new TreeSet<>();
+ for (int i=1; i<= 100; i++) {
+ if (i % 2 == 0) {
+ keysAVolumeBSet.add(
+ prefixKeyA + i);
+ addKeysToOM(volumeNameB, ozoneBucket, prefixKeyA + i, i);
+ } else {
+ keysBVolumeBSet.add(
+ prefixKeyB + i);
+ addKeysToOM(volumeNameB, hadoopBucket, prefixKeyB + i, i);
+ }
+ }
+
+
+ // List all keys which have prefix "key-a"
+ List<OmKeyInfo> omKeyInfoList =
+ omMetadataManager.listKeys(volumeNameA, ozoneBucket,
+ null, prefixKeyA, 100);
+
+ Assert.assertEquals(omKeyInfoList.size(), 50);
+
+ for (OmKeyInfo omKeyInfo : omKeyInfoList) {
+ Assert.assertTrue(omKeyInfo.getKeyName().startsWith(
+ prefixKeyA));
+ }
+
+
+ String startKey = prefixKeyA + 10;
+ omKeyInfoList =
+ omMetadataManager.listKeys(volumeNameA, ozoneBucket,
+ startKey, prefixKeyA, 100);
+
+ Assert.assertEquals(keysASet.tailSet(
+ startKey).size() - 1, omKeyInfoList.size());
+
+ startKey = prefixKeyA + 38;
+ omKeyInfoList =
+ omMetadataManager.listKeys(volumeNameA, ozoneBucket,
+ startKey, prefixKeyA, 100);
+
+ Assert.assertEquals(keysASet.tailSet(
+ startKey).size() - 1, omKeyInfoList.size());
+
+ for (OmKeyInfo omKeyInfo : omKeyInfoList) {
+ Assert.assertTrue(omKeyInfo.getKeyName().startsWith(
+ prefixKeyA));
+ Assert.assertFalse(omKeyInfo.getBucketName().equals(
+ prefixKeyA + 38));
+ }
+
+
+
+ omKeyInfoList = omMetadataManager.listKeys(volumeNameB, hadoopBucket,
+ null, prefixKeyB, 100);
+
+ Assert.assertEquals(omKeyInfoList.size(), 50);
+
+ for (OmKeyInfo omKeyInfo : omKeyInfoList) {
+ Assert.assertTrue(omKeyInfo.getKeyName().startsWith(
+ prefixKeyB));
+ }
+
+ // Try to get keys by count 10, like that get all keys in the
+ // volumeB/ozoneBucket with "key-a".
+ startKey = null;
+ TreeSet<String> expectedKeys = new TreeSet<>();
+ for (int i=0; i<5; i++) {
+
+ omKeyInfoList = omMetadataManager.listKeys(volumeNameB, hadoopBucket,
+ startKey, prefixKeyB, 10);
+
+ Assert.assertEquals(10, omKeyInfoList.size());
+
+ for (OmKeyInfo omKeyInfo : omKeyInfoList) {
+ expectedKeys.add(omKeyInfo.getKeyName());
+ Assert.assertTrue(omKeyInfo.getKeyName().startsWith(
+ prefixKeyB));
+ startKey = omKeyInfo.getKeyName();
+ }
+ }
+
+ Assert.assertEquals(expectedKeys, keysBVolumeBSet);
+
+
+ // As now we have iterated all 50 buckets, calling next time should
+ // return empty list.
+ omKeyInfoList = omMetadataManager.listKeys(volumeNameB, hadoopBucket,
+ startKey, prefixKeyB, 10);
+
+ Assert.assertEquals(omKeyInfoList.size(), 0);
+
+ }
+
+ @Test
+ public void testListKeysWithFewDeleteEntriesInCache() throws Exception {
Review comment:
How are you ensuring entries are in the cache? For that you have to pause
double buffer flush right?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 324798)
Time Spent: 1h 20m (was: 1h 10m)
> Fix listkeys API
> ----------------
>
> Key: HDDS-1986
> URL: https://issues.apache.org/jira/browse/HDDS-1986
> Project: Hadoop Distributed Data Store
> Issue Type: Sub-task
> Reporter: Bharat Viswanadham
> Assignee: Bharat Viswanadham
> Priority: Major
> Labels: pull-request-available
> Time Spent: 1h 20m
> Remaining Estimate: 0h
>
> This Jira is to fix listKeys API in HA code path.
> In HA, we have an in-memory cache, where we put the result to in-memory cache
> and return the response, later it will be picked by double buffer thread and
> it will flush to disk. So, now when do listkeys, it should use both in-memory
> cache and rocksdb key table to list keys in a bucket.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-issues-h...@hadoop.apache.org
