From 14a4ce3cee7aa9e4194ef5de8169c92c2565de65 Mon Sep 17 00:00:00 2001 From: Siyao Meng <50227127+smengcl@users.noreply.github.com> Date: Thu, 8 Aug 2019 13:38:10 -0700 Subject: [PATCH] HDDS-1829 On OM reload/restart OmMetrics#numKeys should be updated. Contributed by Siyao Meng. --- .../org/apache/hadoop/utils/db/RDBTable.java | 10 +++++++++ .../org/apache/hadoop/utils/db/Table.java | 7 +++++++ .../apache/hadoop/utils/db/TypedTable.java | 5 +++++ .../hadoop/utils/db/TestRDBTableStore.java | 21 ++++++++++++++++++- .../utils/db/TestTypedRDBTableStore.java | 21 ++++++++++++++++++- .../hadoop/ozone/om/OMMetadataManager.java | 11 ++++++++++ .../ozone/om/OmMetadataManagerImpl.java | 10 +++++++++ .../apache/hadoop/ozone/om/OzoneManager.java | 2 ++ 8 files changed, 85 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java index f26fcf73524..9d145588ba9 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java @@ -183,4 +183,14 @@ class RDBTable implements Table { public void close() throws Exception { // Nothing do for a Column Family. } + + @Override + public long getEstimatedKeyCount() throws IOException { + try { + return db.getLongProperty(handle, "rocksdb.estimate-num-keys"); + } catch (RocksDBException e) { + throw toIOException( + "Failed to get estimated key count of table " + getName(), e); + } + } } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java index 1c516164284..5c4551f865c 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java @@ -111,6 +111,13 @@ public interface Table extends AutoCloseable { */ String getName() throws IOException; + /** + * Returns the key count of this Table. Note the result can be inaccurate. + * @return Estimated key count of this Table + * @throws IOException on failure + */ + long getEstimatedKeyCount() throws IOException; + /** * Add entry to the table cache. * diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java index e8f9e0a8b30..d0d522d482d 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java @@ -205,6 +205,11 @@ public class TypedTable implements Table { return rawTable.getName(); } + @Override + public long getEstimatedKeyCount() throws IOException { + return rawTable.getEstimatedKeyCount(); + } + @Override public void close() throws Exception { rawTable.close(); diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java index 6b6cd755098..f8113d497f1 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java @@ -51,7 +51,8 @@ public class TestRDBTableStore { Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY), "First", "Second", "Third", "Fourth", "Fifth", - "Sixth", "Seventh"); + "Sixth", "Seventh", + "Eighth"); @Rule public TemporaryFolder folder = new TemporaryFolder(); private RDBStore rdbStore = null; @@ -247,4 +248,22 @@ public class TestRDBTableStore { Assert.assertFalse(testTable.isExist(invalidKey)); } } + + @Test + public void testCountEstimatedRowsInTable() throws Exception { + try (Table testTable = rdbStore.getTable("Eighth")) { + // Add a few keys + final int numKeys = 12345; + for (int i = 0; i < numKeys; i++) { + byte[] key = + RandomStringUtils.random(10).getBytes(StandardCharsets.UTF_8); + byte[] value = + RandomStringUtils.random(10).getBytes(StandardCharsets.UTF_8); + testTable.put(key, value); + } + long keyCount = testTable.getEstimatedKeyCount(); + // The result should be larger than zero but not exceed(?) numKeys + Assert.assertTrue(keyCount > 0 && keyCount <= numKeys); + } + } } diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java index e48a5aa2441..8c154e698ef 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java @@ -55,7 +55,8 @@ public class TestTypedRDBTableStore { Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY), "First", "Second", "Third", "Fourth", "Fifth", - "Sixth", "Seven", "Eighth"); + "Sixth", "Seven", "Eighth", + "Ninth"); @Rule public TemporaryFolder folder = new TemporaryFolder(); private RDBStore rdbStore = null; @@ -351,4 +352,22 @@ public class TestTypedRDBTableStore { Assert.assertFalse(testTable.isExist(key)); } } + + @Test + public void testCountEstimatedRowsInTable() throws Exception { + try (Table testTable = createTypedTable( + "Ninth")) { + // Add a few keys + final int numKeys = 12345; + for (int i = 0; i < numKeys; i++) { + String key = + RandomStringUtils.random(10); + String value = RandomStringUtils.random(10); + testTable.put(key, value); + } + long keyCount = testTable.getEstimatedKeyCount(); + // The result should be larger than zero but not exceed(?) numKeys + Assert.assertTrue(keyCount > 0 && keyCount <= numKeys); + } + } } diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java index f0b54e0c22d..96a0b9689ed 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java @@ -316,4 +316,15 @@ public interface OMMetadataManager { */ long countRowsInTable(Table table) throws IOException; + + /** + * Returns an estimated number of rows in a table. This is much quicker + * than {@link OMMetadataManager#countRowsInTable} but the result can be + * inaccurate. + * @param table Table + * @return long Estimated number of rows in the table. + * @throws IOException + */ + long countEstimatedRowsInTable(Table table) + throws IOException; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java index 460e115d738..7b5d9230fff 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java @@ -816,6 +816,16 @@ public class OmMetadataManagerImpl implements OMMetadataManager { return count; } + @Override + public long countEstimatedRowsInTable(Table table) + throws IOException { + long count = 0; + if (table != null) { + count = table.getEstimatedKeyCount(); + } + return count; + } + @Override public Table getS3SecretTable() { return s3SecretTable; 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 e7719536f92..bbf6a6b52cf 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 @@ -3270,6 +3270,8 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl .getVolumeTable())); metrics.setNumBuckets(metadataManager.countRowsInTable(metadataManager .getBucketTable())); + metrics.setNumKeys(metadataManager.countEstimatedRowsInTable(metadataManager + .getKeyTable())); // Delete the omMetrics file if it exists and save the a new metrics file // with new data