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(visitors): Make sure we disconnect vnodes before leaving rooms. #1170

Merged
merged 2 commits into from
Sep 20, 2024
Merged

fix(visitors): Make sure we disconnect vnodes before leaving rooms. #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f65f3d6
fix(visitors): Make sure we disconnect vnodes before leaving rooms.
damencho Sep 18, 2024
b6ee464
squash: synchronize, refactor.
bgrozev Sep 19, 2024
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
35 changes: 23 additions & 12 deletions jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,17 +644,31 @@ private void leaveTheRoom()
chatRoomRoleManager.stop();
}

chatRoom.leave();
// first disconnect vnodes before leaving
final List<ExtensionElement> disconnectVnodeExtensions;
final List<ChatRoom> visitorChatRoomsToLeave;
synchronized (visitorChatRooms)
{
disconnectVnodeExtensions = visitorChatRooms.keySet().stream()
.map(DisconnectVnodePacketExtension::new).collect(Collectors.toList());
visitorChatRoomsToLeave = new ArrayList<>(visitorChatRooms.values());
visitorChatRooms.clear();
}

final ChatRoom chatRoomToLeave = chatRoom;
chatRoom.removeListener(chatRoomListener);
chatRoom = null;

List<ExtensionElement> disconnectVnodeExtensions = new ArrayList<>();
synchronized (visitorChatRooms)
TaskPools.getIoPool().submit(() ->
{
visitorChatRooms.forEach((vnode, visitorChatRoom) ->
if (!disconnectVnodeExtensions.isEmpty())
{
jicofoServices.getXmppServices().getVisitorsManager()
.sendIqToComponentAndGetResponse(roomName, disconnectVnodeExtensions);
}

visitorChatRoomsToLeave.forEach(visitorChatRoom ->
{
disconnectVnodeExtensions.add(new DisconnectVnodePacketExtension(vnode));
try
{
visitorChatRoom.removeAllListeners();
Expand All @@ -665,14 +679,9 @@ private void leaveTheRoom()
logger.error("Failed to leave visitor room", e);
}
});
visitorChatRooms.clear();
}

if (!disconnectVnodeExtensions.isEmpty())
{
jicofoServices.getXmppServices().getVisitorsManager()
.sendIqToComponent(roomName, disconnectVnodeExtensions);
}
chatRoomToLeave.leave();
});
}

/**
Expand Down Expand Up @@ -2342,6 +2351,7 @@ public void memberKicked(@NotNull ChatRoomMember member)
if (member.getRole() != MemberRole.VISITOR)
{
logger.debug("Member kicked for non-visitor member of visitor room: " + member);
return;
}
onMemberKicked(member);
}
Expand All @@ -2352,6 +2362,7 @@ public void memberLeft(@NotNull ChatRoomMember member)
if (member.getRole() != MemberRole.VISITOR)
{
logger.debug("Member left for non-visitor member of visitor room: " + member);
return;
}
onMemberLeft(member);
}
Expand Down
13 changes: 10 additions & 3 deletions jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/VisitorsManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,24 @@ class VisitorsManager(
logger.info("VisitorsComponentManager is now ${if (enabled) "en" else "dis"}abled with address $address")
}

fun sendIqToComponent(roomJid: EntityBareJid, extensions: List<ExtensionElement>) {
private fun createIq(roomJid: EntityBareJid, extensions: List<ExtensionElement>): VisitorsIq {
val address = this.address ?: throw Exception("Component not available.")
val iq = VisitorsIq.Builder(xmppProvider.xmppConnection).apply {
return VisitorsIq.Builder(xmppProvider.xmppConnection).apply {
to(address)
ofType(IQ.Type.get)
room = roomJid
addExtensions(extensions)
}.build()
}

/** Send an IQ, block for response or timeout, return the result. */
fun sendIqToComponentAndGetResponse(roomJid: EntityBareJid, extensions: List<ExtensionElement>): IQ? =
xmppProvider.xmppConnection.sendIqAndGetResponse(createIq(roomJid, extensions))

/** Send an IQ, return immediately. Log an error if there's no response. */
fun sendIqToComponent(roomJid: EntityBareJid, extensions: List<ExtensionElement>) {
TaskPools.ioPool.submit {
val response = xmppProvider.xmppConnection.sendIqAndGetResponse(iq)
val response = sendIqToComponentAndGetResponse(roomJid, extensions)
when {
response == null -> logger.warn("Timeout waiting for VisitorsIq response.")
response.type == IQ.Type.result -> {
Expand Down
Loading