From b307f2b65c9fa94ee917e4b34ed7a4c19ed99793 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 3 Aug 2016 16:35:24 +0200 Subject: [PATCH] Revert "Fix a deadlock when shutting down during discovery" (#5100) Reverts commit 622017adcf3b1a914221acc0bb2c17e1429ea4c3 Could be the cause of #5092 and the cost is higher than the benefit if this is the case. A network request taking more than 30 seconds isn't something unlikely in this world and shouldn't be a good reason to abort. We should try to untangle the threads dependencies to properly fix this if possible instead. --- src/libsync/discoveryphase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 52a454e9cb..c85fe2d3c4 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -564,7 +564,7 @@ csync_vio_handle_t* DiscoveryJob::remote_vio_opendir_hook (const char *url, discoveryJob->_vioMutex.lock(); const QString qurl = QString::fromUtf8(url); emit discoveryJob->doOpendirSignal(qurl, directoryResult.data()); - discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, 30000); + discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, ULONG_MAX); // FIXME timeout? discoveryJob->_vioMutex.unlock(); qDebug() << discoveryJob << url << "...Returned from main thread";