Skip to content

HDDS-8734. OM DB cache metrics creation should be idempotent #4805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Jun 1, 2023
Merged

HDDS-8734. OM DB cache metrics creation should be idempotent #4805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d80679f
HDDS-8734. Make adding cache metrics for OM DB tables an Idempotent o…
May 31, 2023
40ec4c7
HDDS-8734. Make adding cache metrics for OM DB tables an Idempotent o…
May 31, 2023
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
13 changes: 7 additions & 6 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -294,7 +293,8 @@ public ReentrantReadWriteLock getTableLock(String tableName) {
private final long omEpoch;

private Map<String, Table> tableMap = new HashMap<>();
private List<TableCacheMetrics> tableCacheMetrics = new LinkedList<>();
private final Map<String, TableCacheMetrics> tableCacheMetricsMap =
new HashMap<>();
private SnapshotChainManager snapshotChainManager;

public OmMetadataManagerImpl(OzoneConfiguration conf) throws IOException {
Expand Down Expand Up @@ -463,7 +463,10 @@ private void checkTableStatus(Table table, String name,
}
this.tableMap.put(name, table);
if (addCacheMetrics) {
tableCacheMetrics.add(table.createCacheMetrics());
if (tableCacheMetricsMap.containsKey(name)) {
tableCacheMetricsMap.get(name).unregister();
}
tableCacheMetricsMap.put(name, table.createCacheMetrics());
}
}

Expand Down Expand Up @@ -713,9 +716,7 @@ public void stop() throws IOException {
store.close();
store = null;
}
for (TableCacheMetrics metrics : tableCacheMetrics) {
metrics.unregister();
}
tableCacheMetricsMap.values().forEach(TableCacheMetrics::unregister);
// OzoneManagerLock cleanup
lock.cleanup();
}
Expand Down
42 changes: 42 additions & 0 deletions ...test/java/org/apache/hadoop/ozone/recon/spi/impl/TestOzoneManagerServiceProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,48 @@ public void testUpdateReconOmDBWithNewSnapshot() throws Exception {
.get("/sampleVol/bucketOne/key_two"));
}

@Test
public void testReconOmDBCloseAndOpenNewSnapshotDb() throws Exception {
OMMetadataManager omMetadataManager =
initializeNewOmMetadataManager(temporaryFolder.newFolder());
ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(omMetadataManager,
temporaryFolder.newFolder());

writeDataToOm(omMetadataManager, "key_one");
writeDataToOm(omMetadataManager, "key_two");

DBCheckpoint checkpoint = omMetadataManager.getStore()
.getCheckpoint(true);
File tarFile1 = createTarFile(checkpoint.getCheckpointLocation());
File tarFile2 = createTarFile(checkpoint.getCheckpointLocation());
InputStream inputStream1 = new FileInputStream(tarFile1);
InputStream inputStream2 = new FileInputStream(tarFile2);
ReconUtils reconUtilsMock = getMockReconUtils();
HttpURLConnection httpURLConnectionMock1 = mock(HttpURLConnection.class);
when(httpURLConnectionMock1.getInputStream()).thenReturn(inputStream1);
when(reconUtilsMock.makeHttpCall(any(), anyString(), anyBoolean()))
.thenReturn(httpURLConnectionMock1);

ReconTaskController reconTaskController = getMockTaskController();

OzoneManagerServiceProviderImpl ozoneManagerServiceProvider1 =
new OzoneManagerServiceProviderImpl(configuration,
reconOMMetadataManager, reconTaskController, reconUtilsMock,
ozoneManagerProtocol);
assertTrue(ozoneManagerServiceProvider1.updateReconOmDBWithNewSnapshot());

HttpURLConnection httpURLConnectionMock2 = mock(HttpURLConnection.class);
when(httpURLConnectionMock2.getInputStream()).thenReturn(inputStream2);
when(reconUtilsMock.makeHttpCall(any(), anyString(), anyBoolean()))
.thenReturn(httpURLConnectionMock2);
OzoneManagerServiceProviderImpl ozoneManagerServiceProvider2 =
new OzoneManagerServiceProviderImpl(configuration,
reconOMMetadataManager, reconTaskController, reconUtilsMock,
ozoneManagerProtocol);
assertTrue(ozoneManagerServiceProvider2.updateReconOmDBWithNewSnapshot());
}

@Test
public void testGetOzoneManagerDBSnapshot() throws Exception {

Expand Down