dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-04-04 19:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Confirm migrated tracks info before declare migration completed (#2522)

Browse Source 
* Confirm migrated tracks info before declare migration completed

* log expected mid
This commit is contained in:
cnderrauber
2024-02-28 12:16:34 +08:00
committed by GitHub
parent 5326263d44
commit 20ac7fb416
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/rtc/participant.go
View File

@@ -709,7 +709,10 @@ func (p *ParticipantImpl) handleMigrateTracks() {
if mt != nil {
addedTracks = append(addedTracks, mt)
} else {
p.pubLogger.Warnw("could not find migrated track", nil, "cid", cid)
p.pubLogger.Warnw("could not find migrated track, migration failed", nil, "cid", cid)
p.pendingTracksLock.Unlock()
p.IssueFullReconnect(types.ParticipantCloseReasonMigrateCodecMismatch)
return
}
}
@@ -910,6 +913,9 @@ func (p *ParticipantImpl) SetMigrateState(s types.MigrateState) {
}
p.params.Logger.Debugw("SetMigrateState", "state", s)
if s == types.MigrateStateComplete {
p.handleMigrateTracks()
}
p.migrateState.Store(s)
p.dirty.Store(true)
@@ -918,7 +924,7 @@ func (p *ParticipantImpl) SetMigrateState(s types.MigrateState) {
p.TransportManager.ProcessPendingPublisherOffer()
case types.MigrateStateComplete:
p.handleMigrateTracks()
p.TransportManager.ProcessPendingPublisherDataChannels()
}
@@ -1966,7 +1972,7 @@ func (p *ParticipantImpl) addMigratedTrack(cid string, ti *livekit.TrackInfo) *M
p.pubLogger.Infow("add migrated track", "cid", cid, "trackID", ti.Sid, "track", logger.Proto(ti))
rtpReceiver := p.TransportManager.GetPublisherRTPReceiver(ti.Mid)
if rtpReceiver == nil {
p.pubLogger.Errorw("could not find receiver for migrated track", nil, "trackID", ti.Sid)
p.pubLogger.Errorw("could not find receiver for migrated track", nil, "trackID", ti.Sid, "mid", ti.Mid)
return nil
}