Skip to content

Fix MultiApplicationHealthIndicator stack overflow bug #607

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
caojie09 merged 2 commits into from
Mar 9, 2020
Merged

Fix MultiApplicationHealthIndicator stack overflow bug #607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51e158
fix MultiApplicationHealthIndicator bug
Mar 9, 2020
b2e859d
change to class fqn
Mar 9, 2020
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
14 changes: 8 additions & 6 deletions ...r/src/main/java/com/alipay/sofa/boot/actuator/health/MultiApplicationHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.alipay.sofa.boot.actuator.health;

import com.alipay.sofa.ark.spi.model.Biz;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;

Expand All @@ -35,16 +36,17 @@ public Health health() {
boolean allPassed = true;
Health.Builder builder = new Health.Builder();
for (SofaRuntimeManager sofaRuntimeManager : SofaFramework.getRuntimeSet()) {
Biz biz = DynamicJvmServiceProxyFinder.getBiz(sofaRuntimeManager);
if (biz == null) {
continue;
}

if (!sofaRuntimeManager.isLivenessHealth()) {
allPassed = false;
builder.withDetail(
String.format("Biz: %s health check",
DynamicJvmServiceProxyFinder.getBiz(sofaRuntimeManager).getIdentity()),
builder.withDetail(String.format("Biz: %s health check", biz.getIdentity()),
"failed");
} else {
builder.withDetail(
String.format("Biz: %s health check",
DynamicJvmServiceProxyFinder.getBiz(sofaRuntimeManager).getIdentity()),
builder.withDetail(String.format("Biz: %s health check", biz.getIdentity()),
"passed");
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...ck-sofa-boot/src/main/java/com/alipay/sofa/healthcheck/impl/SofaRuntimeHealthChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public boolean isReadinessHealth() {
@Override
public boolean isLivenessHealth() {
for (HealthIndicator healthIndicator : healthIndicators) {
if (healthIndicator.getClass().getSimpleName()
Copy link
Contributor

@caojie09 caojie09 Mar 9, 2020

Choose a reason for hiding this comment

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

use getName.

.equals("MultiApplicationHealthIndicator")) {
continue;
}
if (healthIndicator.health().getStatus().equals(Status.DOWN)) {
return false;
}
Expand Down
4 changes: 4 additions & 0 deletions ...-sofa-boot/src/main/java/com/alipay/sofa/runtime/invoke/DynamicJvmServiceProxyFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ private ServiceComponent findServiceComponent(String uniqueId, String interfaceT
* @return
*/
public static Biz getBiz(SofaRuntimeManager sofaRuntimeManager) {
if (getDynamicJvmServiceProxyFinder().bizManagerService == null) {
return null;
}

for (Biz biz : getDynamicJvmServiceProxyFinder().bizManagerService.getBizInOrder()) {
if (sofaRuntimeManager.getAppClassLoader().equals(biz.getBizClassLoader())) {
return biz;
Expand Down