Skip to content
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

Jump to bottom

Fix local endpoint count (prevent premature shutdown). #1906

Merged
merged 5 commits into from
Jun 6, 2022
Merged

Fix local endpoint count (prevent premature shutdown). #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dce7836
fix: Do not call endpointExpired() for RelayedEndpoints.
bgrozev Jun 3, 2022
fc329e1
ref: Rename endpointExpired to localEndpointExpired.
bgrozev Jun 3, 2022
4fd0a6e
fix: Log, do not shutdown if endpoint count is invalid.
bgrozev Jun 3, 2022
4583965
ref: Rename localEndpointExpired to endpointExpired.
bgrozev Jun 3, 2022
402058a
fix: Call Relay.endpointExpired for Relayed endpoints.
bgrozev Jun 3, 2022
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
25 changes: 13 additions & 12 deletions jvb/src/main/java/org/jitsi/videobridge/Conference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ public Endpoint createLocalEndpoint(String id, boolean iceControlling, boolean s
}

final Endpoint endpoint = new Endpoint(id, this, logger, iceControlling, sourceNames);
videobridge.endpointCreated();
videobridge.localEndpointCreated();

subscribeToEndpointEvents(endpoint);

Expand Down Expand Up @@ -996,22 +996,23 @@ public void endpointExpired(AbstractEndpoint endpoint)
final AbstractEndpoint removedEndpoint;
String id = endpoint.getId();
removedEndpoint = endpointsById.remove(id);
if (removedEndpoint != null)
if (removedEndpoint == null)
{
updateEndpointsCache();
logger.warn("No endpoint found, id=" + id);
return;
}

endpointsById.forEach((i, senderEndpoint) -> senderEndpoint.removeReceiver(id));

endpoint.getSsrcs().forEach(ssrc -> endpointsBySsrc.remove(ssrc, endpoint));

relaysById.forEach((i, relay) -> relay.localEndpointExpired(id));

if (removedEndpoint != null)
if (removedEndpoint instanceof Endpoint)
{
endpointsChanged();
videobridge.endpointExpired();
// The removed endpoint was a local Endpoint as opposed to a RelayedEndpoint.
updateEndpointsCache();
endpointsById.forEach((i, senderEndpoint) -> senderEndpoint.removeReceiver(id));
videobridge.localEndpointExpired();
}

relaysById.forEach((i, relay) -> relay.endpointExpired(id));
endpoint.getSsrcs().forEach(ssrc -> endpointsBySsrc.remove(ssrc, endpoint));
endpointsChanged();
}

/**
Expand Down
12 changes: 9 additions & 3 deletions jvb/src/main/java/org/jitsi/videobridge/Videobridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,20 @@ public JvbHealthChecker getJvbHealthChecker()
return conference;
}

void endpointCreated()
void localEndpointCreated()
{
statistics.currentLocalEndpoints.incrementAndGet();
}

void endpointExpired()
void localEndpointExpired()
{
shutdownManager.maybeShutdown(statistics.currentLocalEndpoints.decrementAndGet());
long remainingEndpoints = statistics.currentLocalEndpoints.decrementAndGet();
if (remainingEndpoints < 0)
{
logger.warn("Invalid endpoint count " + remainingEndpoints + ". Disabling endpoint-count based shutdown!");
return;
}
shutdownManager.maybeShutdown(remainingEndpoints);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ class Relay @JvmOverloads constructor(
}
}

fun localEndpointExpired(id: String) {
fun endpointExpired(id: String) {
val s = senders.remove(id)
s?.expire()
}
Expand Down
4 changes: 2 additions & 2 deletions jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class VideobridgeTest : ShouldSpec() {
context("Shutdown") {
context("when a conference is active") {
withNewConfig("videobridge.shutdown.graceful-shutdown-min-participants=10") {
repeat(15) { videobridge.endpointCreated() }
repeat(15) { videobridge.localEndpointCreated() }
context("starting a graceful shutdown") {
videobridge.shutdown(true)
should("report that shutdown is in progress") {
Expand All @@ -74,7 +74,7 @@ class VideobridgeTest : ShouldSpec() {
resp.error.condition shouldBe StanzaError.Condition.service_unavailable
}
context("When the number of participants drops below the threshold") {
repeat(10) { videobridge.endpointExpired() }
repeat(10) { videobridge.localEndpointExpired() }
videobridge.shutdownState shouldBe ShutdownState.SHUTTING_DOWN
fakeExecutor.clock.elapse(ShutdownConfig.config.shuttingDownDelay)
fakeExecutor.run()
Expand Down