From c97e58c9b51aab2667b5c98d4d810ff76d9dfafa Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Tue, 8 Oct 2019 14:32:52 -0500 Subject: [PATCH] MCOL-3357: reorder this since maxThreads is set by configListener now. --- storage-manager/src/Downloader.cpp | 1 - storage-manager/src/Synchronizer.cpp | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/storage-manager/src/Downloader.cpp b/storage-manager/src/Downloader.cpp index b70fc7bde..0c230f566 100644 --- a/storage-manager/src/Downloader.cpp +++ b/storage-manager/src/Downloader.cpp @@ -33,7 +33,6 @@ Downloader::Downloader() : maxDownloads(0) storage = CloudStorage::get(); configListener(); Config::get()->addConfigListener(this); - workers.setMaxThreads(maxDownloads); workers.setName("Downloader"); logger = SMLogging::get(); tmpPath = "downloading"; diff --git a/storage-manager/src/Synchronizer.cpp b/storage-manager/src/Synchronizer.cpp index 2fe652732..979c1ac94 100644 --- a/storage-manager/src/Synchronizer.cpp +++ b/storage-manager/src/Synchronizer.cpp @@ -62,14 +62,12 @@ Synchronizer::Synchronizer() : maxUploads(0) numBytesRead = numBytesWritten = numBytesUploaded = numBytesDownloaded = mergeDiff = flushesTriggeredBySize = flushesTriggeredByTimer = journalsMerged = objectsSyncedWithNoJournal = bytesReadBySync = bytesReadBySyncWithJournal = 0; - - configListener(); - config->addConfigListener(this); journalPath = cache->getJournalPath(); cachePath = cache->getCachePath(); threadPool.reset(new ThreadPool()); - threadPool->setMaxThreads(maxUploads); + configListener(); + config->addConfigListener(this); die = false; journalSizeThreshold = cache->getMaxCacheSize() / 2; blockNewJobs = false;