natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix start standalone fail because db not init yet (#8191)

This commit is contained in:
wind 2022-01-25 18:10:02 +08:00 committed by GitHub
parent 103ccb01da
commit 128ede3ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java
View File

@ -39,6 +39,8 @@ import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
@Component
@ -53,8 +55,8 @@ public final class AlertPluginManager {
this.pluginDao = pluginDao;
}
@PostConstruct
public void installPlugin() {
@EventListener
public void installPlugin(ApplicationReadyEvent readyEvent) {
final Set<String> names = new HashSet<>();
ServiceLoader.load(AlertChannelFactory.class).forEach(factory -> {

6
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
View File

@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.event.EventListener;
@SpringBootApplication
@ComponentScan("org.apache.dolphinscheduler")
@ -68,8 +70,8 @@ public class AlertServer implements Closeable {
SpringApplication.run(AlertServer.class, args);
}
@PostConstruct
public void start() {
@EventListener
public void start(ApplicationReadyEvent readyEvent) {
logger.info("Starting Alert server");
checkTable();

2
dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/AlertPluginManagerTest.java
View File

@ -41,7 +41,7 @@ public class AlertPluginManagerTest extends TestCase {
public void testAlertPluginManager() {
Mockito.when(pluginDao.addOrUpdatePluginDefine(Mockito.any(PluginDefine.class))).thenReturn(0);
alertPluginManager.installPlugin();
alertPluginManager.installPlugin(null);
Assert.assertEquals(1, alertPluginManager.size());

2
dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
View File

@ -49,7 +49,7 @@ public class AlertServerTest extends TestCase {
Mockito.when(alertConfig.getPort()).thenReturn(50053);
alertServer.start();
alertServer.start(null);
NettyRemotingServer nettyRemotingServer = Whitebox.getInternalState(alertServer, "server");