-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ISSUE #42] fix the problem HealthExcutor don't doCheck asynchronously (
#43) * fix: let HealthExecutor support async doCheck * chore: move test files out of unit folder * chore: add HealthConstant * chore * style: rewrite description assign in CheckResultCache in if-else
- Loading branch information
1 parent
15b1f40
commit d816839
Showing
10 changed files
with
143 additions
and
17 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
...console/src/main/java/org/apache/eventmesh/dashboard/console/constant/HealthConstant.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.eventmesh.dashboard.console.constant; | ||
|
|
||
| public class HealthConstant { | ||
| public static final String NEW_LINE_ENDING = "\n"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...org/apache/eventmesh/dashboard/console/integration/health/HealthServiceIntegrateTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.eventmesh.dashboard.console.integration.health; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity; | ||
| import org.apache.eventmesh.dashboard.console.enums.health.HealthCheckType; | ||
| import org.apache.eventmesh.dashboard.console.health.CheckResultCache; | ||
| import org.apache.eventmesh.dashboard.console.health.HealthService; | ||
| import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig; | ||
| import org.apache.eventmesh.dashboard.console.service.health.HealthDataService; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.test.context.ActiveProfiles; | ||
| import org.springframework.test.context.jdbc.Sql; | ||
|
|
||
| @SpringBootTest | ||
| @ActiveProfiles("test") | ||
| @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:use-test-schema.sql", "classpath:eventmesh-dashboard.sql"}) | ||
| public class HealthServiceIntegrateTest { | ||
| HealthService healthService = new HealthService(); | ||
|
|
||
| @Autowired | ||
| private HealthDataService healthDataService; | ||
|
|
||
| private final CheckResultCache checkResultCache = new CheckResultCache(); | ||
| @BeforeEach | ||
| void init() { | ||
| healthService.createExecutor(healthDataService, checkResultCache); | ||
| } | ||
|
|
||
| @Test | ||
| void testStorageRedis() throws InterruptedException { | ||
| HealthCheckObjectConfig config = new HealthCheckObjectConfig(); | ||
| config.setClusterId(1L); | ||
| config.setInstanceId(1L); | ||
| config.setHealthCheckResourceType("storage"); | ||
| config.setHealthCheckResourceSubType("redis"); | ||
| config.setConnectUrl("redis://localhost:6379"); | ||
| healthService.insertCheckService(config); | ||
| healthService.executeAll(); | ||
| Thread.sleep(1000); | ||
| healthService.executeAll(); | ||
|
|
||
| HealthCheckResultEntity queryEntity = new HealthCheckResultEntity(); | ||
| queryEntity.setClusterId(1L); | ||
| queryEntity.setType(HealthCheckType.STORAGE.getNumber()); | ||
| queryEntity.setTypeId(1L); | ||
| List<HealthCheckResultEntity> results = healthDataService.queryHealthCheckResultByClusterIdAndTypeAndTypeId(queryEntity); | ||
| Assertions.assertEquals(2,results.size()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters