HDDS-1829 On OM reload/restart OmMetrics#numKeys should be updated (#1164)
This commit is contained in:
parent
8053085388
commit
4d07134b13
|
@ -183,4 +183,14 @@ class RDBTable implements Table<byte[], byte[]> {
|
||||||
public void close() throws Exception {
|
public void close() throws Exception {
|
||||||
// Nothing do for a Column Family.
|
// 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,6 +111,13 @@ public interface Table<KEY, VALUE> extends AutoCloseable {
|
||||||
*/
|
*/
|
||||||
String getName() throws IOException;
|
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.
|
* Add entry to the table cache.
|
||||||
*
|
*
|
||||||
|
|
|
@ -205,6 +205,11 @@ public class TypedTable<KEY, VALUE> implements Table<KEY, VALUE> {
|
||||||
return rawTable.getName();
|
return rawTable.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getEstimatedKeyCount() throws IOException {
|
||||||
|
return rawTable.getEstimatedKeyCount();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() throws Exception {
|
public void close() throws Exception {
|
||||||
rawTable.close();
|
rawTable.close();
|
||||||
|
|
|
@ -51,7 +51,8 @@ public class TestRDBTableStore {
|
||||||
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
|
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
|
||||||
"First", "Second", "Third",
|
"First", "Second", "Third",
|
||||||
"Fourth", "Fifth",
|
"Fourth", "Fifth",
|
||||||
"Sixth", "Seventh");
|
"Sixth", "Seventh",
|
||||||
|
"Eighth");
|
||||||
@Rule
|
@Rule
|
||||||
public TemporaryFolder folder = new TemporaryFolder();
|
public TemporaryFolder folder = new TemporaryFolder();
|
||||||
private RDBStore rdbStore = null;
|
private RDBStore rdbStore = null;
|
||||||
|
@ -247,4 +248,22 @@ public class TestRDBTableStore {
|
||||||
Assert.assertFalse(testTable.isExist(invalidKey));
|
Assert.assertFalse(testTable.isExist(invalidKey));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCountEstimatedRowsInTable() throws Exception {
|
||||||
|
try (Table<byte[], byte[]> 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 count = testTable.getEstimatedKeyCount();
|
||||||
|
// The result should be larger than zero but not exceed(?) numKeys
|
||||||
|
Assert.assertTrue(count > 0 && count <= numKeys);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,8 @@ public class TestTypedRDBTableStore {
|
||||||
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
|
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
|
||||||
"First", "Second", "Third",
|
"First", "Second", "Third",
|
||||||
"Fourth", "Fifth",
|
"Fourth", "Fifth",
|
||||||
"Sixth", "Seven", "Eighth");
|
"Sixth", "Seven", "Eighth",
|
||||||
|
"Ninth");
|
||||||
@Rule
|
@Rule
|
||||||
public TemporaryFolder folder = new TemporaryFolder();
|
public TemporaryFolder folder = new TemporaryFolder();
|
||||||
private RDBStore rdbStore = null;
|
private RDBStore rdbStore = null;
|
||||||
|
@ -351,4 +352,22 @@ public class TestTypedRDBTableStore {
|
||||||
Assert.assertFalse(testTable.isExist(key));
|
Assert.assertFalse(testTable.isExist(key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCountEstimatedRowsInTable() throws Exception {
|
||||||
|
try (Table<String, String> 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 count = testTable.getEstimatedKeyCount();
|
||||||
|
// The result should be larger than zero but not exceed(?) numKeys
|
||||||
|
Assert.assertTrue(count > 0 && count <= numKeys);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -316,4 +316,15 @@ public interface OMMetadataManager {
|
||||||
*/
|
*/
|
||||||
<KEY, VALUE> long countRowsInTable(Table<KEY, VALUE> table)
|
<KEY, VALUE> long countRowsInTable(Table<KEY, VALUE> table)
|
||||||
throws IOException;
|
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
|
||||||
|
*/
|
||||||
|
<KEY, VALUE> long countEstimatedRowsInTable(Table<KEY, VALUE> table)
|
||||||
|
throws IOException;
|
||||||
}
|
}
|
||||||
|
|
|
@ -802,6 +802,16 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <KEY, VALUE> long countEstimatedRowsInTable(Table<KEY, VALUE> table)
|
||||||
|
throws IOException {
|
||||||
|
long count = 0;
|
||||||
|
if (table != null) {
|
||||||
|
count = table.getEstimatedKeyCount();
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Table<String, S3SecretValue> getS3SecretTable() {
|
public Table<String, S3SecretValue> getS3SecretTable() {
|
||||||
return s3SecretTable;
|
return s3SecretTable;
|
||||||
|
|
|
@ -3267,6 +3267,8 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
|
||||||
.getVolumeTable()));
|
.getVolumeTable()));
|
||||||
metrics.setNumBuckets(metadataManager.countRowsInTable(metadataManager
|
metrics.setNumBuckets(metadataManager.countRowsInTable(metadataManager
|
||||||
.getBucketTable()));
|
.getBucketTable()));
|
||||||
|
metrics.setNumKeys(metadataManager.countEstimatedRowsInTable(metadataManager
|
||||||
|
.getKeyTable()));
|
||||||
|
|
||||||
// Delete the omMetrics file if it exists and save the a new metrics file
|
// Delete the omMetrics file if it exists and save the a new metrics file
|
||||||
// with new data
|
// with new data
|
||||||
|
|
Loading…
Reference in New Issue