StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

health endpoint should check available for requests endpoint (#180)

Browse Source
This commit is contained in:
a10zn8
2023-03-21 16:58:08 +03:00
committed by GitHub
parent 74d666a0bd
commit f41ee1e577
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/io/emeraldpay/dshackle/monitoring/HealthCheckSetup.kt
View File

@@ -18,7 +18,6 @@ package io.emeraldpay.dshackle.monitoring
import com.sun.net.httpserver.HttpServer import com.sun.net.httpserver.HttpServer
import io.emeraldpay.dshackle.config.HealthConfig import io.emeraldpay.dshackle.config.HealthConfig
import io.emeraldpay.dshackle.upstream.MultistreamHolder import io.emeraldpay.dshackle.upstream.MultistreamHolder
import io.emeraldpay.dshackle.upstream.UpstreamAvailability
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
@@ -83,9 +82,9 @@ class HealthCheckSetup(
if (!up.isAvailable()) { if (!up.isAvailable()) {
return@mapNotNull "${it.blockchain} UNAVAILABLE" return@mapNotNull "${it.blockchain} UNAVAILABLE"
} }
val avail = up.getAll().count { it.getStatus() == UpstreamAvailability.OK } val avail = up.getAll().count { it.isAvailable() }
if (avail < it.minAvailable) { if (avail < it.minAvailable) {
return@mapNotNull "${it.blockchain} LACKS MIN AVAILABILITY" return@mapNotNull "${it.blockchain} LACKS MIN AVAILABILITY [CURRENT: $avail]"
} }
null null
} }
@@ -112,7 +111,7 @@ class HealthCheckSetup(
} else { } else {
val ups = up.getAll() val ups = up.getAll()
val checks = if (required != null) { val checks = if (required != null) {
val avail = ups.count { it.getStatus() == UpstreamAvailability.OK } val avail = ups.count { it.isAvailable() }
if (avail < required.minAvailable) { if (avail < required.minAvailable) {
chainUnavailable = true chainUnavailable = true
listOf(" LACKS MIN AVAILABILITY") listOf(" LACKS MIN AVAILABILITY")

22
src/test/groovy/io/emeraldpay/dshackle/monitoring/HealthCheckSetupSpec.groovy
View File

@@ -46,7 +46,7 @@ class HealthCheckSetupSpec extends Specification {
1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams 1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams
1 * ethereumUpstreams.available >> true 1 * ethereumUpstreams.available >> true
1 * ethereumUpstreams.getAll() >> [up1] 1 * ethereumUpstreams.getAll() >> [up1]
1 * up1.status >> UpstreamAvailability.OK 1 * up1.isAvailable() >> true
} }
def "OK when meets availability - 1 - bitcoin"() { def "OK when meets availability - 1 - bitcoin"() {
@@ -70,7 +70,7 @@ class HealthCheckSetupSpec extends Specification {
1 * multistream.getUpstream(Chain.BITCOIN) >> bitcoinUpstreams 1 * multistream.getUpstream(Chain.BITCOIN) >> bitcoinUpstreams
1 * bitcoinUpstreams.available >> true 1 * bitcoinUpstreams.available >> true
1 * bitcoinUpstreams.getAll() >> [up1] 1 * bitcoinUpstreams.getAll() >> [up1]
1 * up1.status >> UpstreamAvailability.OK 1 * up1.isAvailable() >> true
} }
def "OK when meets availability - 2/3"() { def "OK when meets availability - 2/3"() {
@@ -96,9 +96,9 @@ class HealthCheckSetupSpec extends Specification {
1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams 1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams
1 * ethereumUpstreams.available >> true 1 * ethereumUpstreams.available >> true
1 * ethereumUpstreams.getAll() >> [up1, up2, up3] 1 * ethereumUpstreams.getAll() >> [up1, up2, up3]
1 * up1.status >> UpstreamAvailability.OK 1 * up1.isAvailable() >> true
1 * up2.status >> UpstreamAvailability.SYNCING 1 * up2.isAvailable() >> false
1 * up3.status >> UpstreamAvailability.OK 1 * up3.isAvailable() >> true
} }
def "OK when doesn't meet availability - 2/3"() { def "OK when doesn't meet availability - 2/3"() {
@@ -124,9 +124,9 @@ class HealthCheckSetupSpec extends Specification {
1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams 1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams
1 * ethereumUpstreams.available >> true 1 * ethereumUpstreams.available >> true
1 * ethereumUpstreams.getAll() >> [up1, up2, up3] 1 * ethereumUpstreams.getAll() >> [up1, up2, up3]
1 * up1.status >> UpstreamAvailability.OK 1 * up1.isAvailable() >> true
1 * up2.status >> UpstreamAvailability.SYNCING 1 * up2.isAvailable() >> false
1 * up3.status >> UpstreamAvailability.LAGGING 1 * up3.isAvailable() >> false
} }
def "OK when meets availability - 2/3 - detailed"() { def "OK when meets availability - 2/3 - detailed"() {
@@ -153,8 +153,8 @@ class HealthCheckSetupSpec extends Specification {
1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams 1 * multistream.getUpstream(Chain.ETHEREUM) >> ethereumUpstreams
1 * ethereumUpstreams.available >> true 1 * ethereumUpstreams.available >> true
1 * ethereumUpstreams.getAll() >> [up1, up2, up3] 1 * ethereumUpstreams.getAll() >> [up1, up2, up3]
_ * up1.status >> UpstreamAvailability.OK _ * up1.isAvailable() >> true
_ * up2.status >> UpstreamAvailability.SYNCING _ * up2.isAvailable() >> false
_ * up3.status >> UpstreamAvailability.OK _ * up3.isAvailable() >> true
} }
} }