Skip to content

bug fix for lookup leak when we remove the last lookup from lookup tier #8598

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
himanshug merged 4 commits into from
Sep 27, 2019
Merged

bug fix for lookup leak when we remove the last lookup from lookup tier #8598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ad8a2e
bug fix for lookup leak when we remove the last lookup from lookup tier
Sep 26, 2019
1324b31
warnings about lookups that will never be loaded
himanshug Sep 26, 2019
205e57e
Merge pull request #1 from himanshug/patch-8598
FaxianZhao Sep 27, 2019
1ef4e44
fix unit test
Sep 27, 2019
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
21 changes: 16 additions & 5 deletions server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,16 +557,27 @@ void lookupManagementLoop()

try {
List<ListenableFuture<Map.Entry>> futures = new ArrayList<>();
for (Map.Entry<String, Map<String, LookupExtractorFactoryMapContainer>> tierEntry : allLookupTiers.entrySet()) {

LOG.debug("Starting lookup mgmt for tier [%s].", tierEntry.getKey());
Set<String> discoveredLookupTiers = lookupNodeDiscovery.getAllTiers();

final Map<String, LookupExtractorFactoryMapContainer> tierLookups = tierEntry.getValue();
for (final HostAndPortWithScheme node : lookupNodeDiscovery.getNodesInTier(tierEntry.getKey())) {
// Check and Log warnings about lookups configured by user in DB but no nodes discovered to load those.
for (String tierInDB : allLookupTiers.keySet()) {
if (!discoveredLookupTiers.contains(tierInDB) &&
!allLookupTiers.getOrDefault(tierInDB, ImmutableMap.of()).isEmpty()) {
LOG.warn("Found lookups for tier [%s] in DB, but no nodes discovered for it", tierInDB);
}
}

for (String tier : discoveredLookupTiers) {

LOG.debug("Starting lookup mgmt for tier [%s].", tier);

final Map<String, LookupExtractorFactoryMapContainer> tierLookups = allLookupTiers.getOrDefault(tier, ImmutableMap.of());
for (final HostAndPortWithScheme node : lookupNodeDiscovery.getNodesInTier(tier)) {

LOG.debug(
"Starting lookup mgmt for tier [%s] and host [%s:%s:%s].",
tierEntry.getKey(),
tier,
node.getScheme(),
node.getHostText(),
node.getPort()
Expand Down
4 changes: 4 additions & 0 deletions server/src/test/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,10 @@ public void testLookupManagementLoop() throws Exception
HostAndPortWithScheme host2 = HostAndPortWithScheme.fromParts("http", "host2", 3456);

EasyMock.reset(lookupNodeDiscovery);
EasyMock
.expect(lookupNodeDiscovery.getAllTiers())
.andReturn(ImmutableSet.of("tier1"))
.once();
EasyMock
.expect(lookupNodeDiscovery.getNodesInTier("tier1"))
.andReturn(ImmutableList.of(host1, host2))
Expand Down