Skip to content

[Bug Fix] Broker will not wait for its SQL metadata view to fully initialize before starting up, even though set awaitInitializationOnStart true #10779

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
suneet-s merged 2 commits into from
Jan 22, 2021
Merged

[Bug Fix] Broker will not wait for its SQL metadata view to fully initialize before starting up, even though set awaitInitializationOnStart true #10779

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
1fb37e8
enhance the logic of Start up DruidSchema immediately if there are no…
Jan 19, 2021
fb1a7fc
add UT to test DruidSchema init
Jan 20, 2021
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
4 changes: 3 additions & 1 deletion sql/src/main/java/org/apache/druid/sql/calcite/schema/DruidSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ public void start() throws InterruptedException
break;
}

if (isServerViewInitialized) {
// lastFailure != 0L means exceptions happened before and there're some refresh work was not completed.
// so that even ServerView is initialized, we can't let broker complete initialization.
if (isServerViewInitialized && lastFailure == 0L) {
Copy link
Copy Markdown
Contributor

@gianm gianm Jan 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is saying that we will mark as initialized when all of these are true:

(a) no refresh is needed
(b) the server view is initialized
(c) there wasn't a refresh that just failed

Sounds good to me - thanks for the fix!

Do you think you could add a test for this case too? Maybe something like DruidSchemaTest, but that creates a DruidSchema using a QueryLifecycleFactory where the first query fails fail, and then after that they start succeeding. We'd want to make sure that when awaitInitialization() returns, things are really initialized.

// Server view is initialized, but we don't need to do a refresh. Could happen if there are
// no segments in the system yet. Just mark us as initialized, then.
initialized.countDown();
Expand Down
46 changes: 46 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public static void tearDownClass() throws IOException

private SpecificSegmentsQuerySegmentWalker walker = null;
private DruidSchema schema = null;
private DruidSchema schema2 = null;
private SegmentManager segmentManager;
private Set<String> segmentDataSourceNames;
private Set<String> joinableDataSourceNames;
Expand Down Expand Up @@ -269,6 +270,38 @@ protected DruidTable buildDruidTable(String dataSource)
}
};

schema2 = new DruidSchema(
CalciteTests.createMockQueryLifecycleFactory(walker, conglomerate),
serverView,
segmentManager,
new MapJoinableFactory(ImmutableSet.of(globalTableJoinable), ImmutableMap.of(globalTableJoinable.getClass(), GlobalTableDataSource.class)),
PLANNER_CONFIG_DEFAULT,
new NoopViewManager(),
new NoopEscalator()
)
{

boolean throwException = true;
@Override
protected DruidTable buildDruidTable(String dataSource)
{
DruidTable table = super.buildDruidTable(dataSource);
buildTableLatch.countDown();
return table;
}

@Override
Set<SegmentId> refreshSegments(final Set<SegmentId> segments) throws IOException
{
if (throwException) {
throwException = false;
throw new RuntimeException("Query[xxxx] url[http://xxxx:8083/druid/v2/] timed out.");
} else {
return super.refreshSegments(segments);
}
}
};

schema.start();
schema.awaitInitialization();
}
Expand All @@ -289,6 +322,19 @@ public void testGetTableMap()
Assert.assertEquals(ImmutableSet.of("foo", "foo2"), tableMap.keySet());
}

@Test
public void testSchemaInit() throws InterruptedException
{
schema2.start();
schema2.awaitInitialization();
Map<String, Table> tableMap = schema2.getTableMap();
Assert.assertEquals(2, tableMap.size());
Assert.assertTrue(tableMap.containsKey("foo"));
Assert.assertTrue(tableMap.containsKey("foo2"));
schema2.stop();
}


@Test
public void testGetTableMapFoo()
{
Expand Down