Merge druid-api, druid-common and java-util modules into druid-common#5490
Merge druid-api, druid-common and java-util modules into druid-common#5490leventov wants to merge 1 commit intoapache:masterfrom
Conversation
There was a problem hiding this comment.
I'm not going to do this in this PR
There was a problem hiding this comment.
okay, can we add more context to what the TODO means and link it to an issue?
There was a problem hiding this comment.
I think it makes sense, in this PR, to change nothing about the content and just collapse the modules.
There was a problem hiding this comment.
@b-slim previous comment was a lengthy explanation why those config classes couldn't be merged at that time. Now they could. I didn't want to add explanations why it should be done, because previously it wasn't as well (it is considered obvious, I suppose.)
Anyway, in general we don't usually add TODOs and favor issues on github; I've created #5491.
|
looks good to me, but there are some merge conflicts. |
ea5176c to
560306b
Compare
|
@leventov would you resolve conflicts? I think this PR should be merged as soon as possible to avoid further conflicts. |
|
This patch looks good to me. I'll finish my review if CI is fixed. |
|
Unfortunately I don't know how to fix the CI. That are strange problems that I cannot reproduce locally. Any ideas welcome. |
|
The failure in LoggingRequestLoggerTest looks like a bug in the test. It has this code, @BeforeClass
public static void setUpStatic() throws Exception
{
appender = OutputStreamAppender
.newBuilder()
.setName("test stream")
.setTarget(baos)
.setLayout(JsonLayout.createLayout(false, true, false, true, true, Charsets.UTF_8))
.build();
final Logger logger = (Logger)
LogManager.getLogger(LoggingRequestLogger.class);
appender.start();
logger.addAppender(appender);
}
@After
public void tearDown()
{
baos.reset();
}But this is wrong. |
|
I'm not sure what causes the other, docker integration test failure. |
|
I can reproduce the IT test failure locally. I'm still not sure what's the problem but I could see every Druid servers work well. |
|
@leventov ok. The unit test failures in The integration tests failure looks somehow related to service discovery. I can see these logs a lot in the overlord log. I checked mysql, zookeeper, and druid coordinator were running well. BTW, you should be able to reproduce the test failures locally by deleting the maven local cache and installing druid. |
fad7561 to
0e1a3c1
Compare
571725b to
7eec889
Compare
|
I give up trying to do this |
I had to collapse druid-api, druid-common and java-util, to avoid cyclic dependencies. It was a part of #4312 plan.
First part of #5488.