Ticket #8526: mainserver_slave_disconnect_deadlock.patch

programs/mythbackend/mainserver.cpp

@@ -5132 +5132 @@
         }
         else if (sock == socket)
         {
+            list<uint> disconnectedSlaves;
+            bool needsReschedule = false;
+    
             if (ismaster && pbs->isSlaveBackend())
             {
                 VERBOSE(VB_IMPORTANT,QString("Slave backend: %1 no longer connected")
@@ -5148 +5151 @@
                             isFallingAsleep = false;
 
                         elink->SetSocket(NULL);
-                        if (m_sched)
-                            m_sched->SlaveDisconnected(elink->GetCardID());
+                        if (m_sched) disconnectedSlaves.push_back(elink->GetCardID());
                     }
                 }
                 if (m_sched && !isFallingAsleep)
-                    m_sched->Reschedule(0);
+                    needsReschedule = true;
 
                 QString message = QString("LOCAL_SLAVE_BACKEND_OFFLINE %1")
                                           .arg(pbs->getHostname());
@@ -5207 +5209 @@
                 VERBOSE(VB_IMPORTANT, "Playback sock still exists?");
 
             sockListLock.unlock();
+            for (list<uint>::iterator p = disconnectedSlaves.begin() ;
+                p != disconnectedSlaves.end() ; p++) {
+              if (m_sched) m_sched->SlaveDisconnected(*p);
+            }
 
+            if (m_sched && needsReschedule)
+                m_sched->Reschedule(0);
+
             pbs->DownRef();
             return;
         }