Further lock adjustments and put in missed IsComplete()

Author: jamescowens

src/scraper/scraper.cpp

@@ -4704,14 +4704,6 @@ bool ScraperConstructConvergedManifestByProject(const NN::WhitelistSnapshot& pro
                 _log(logattribute::INFO, "ENDLOCK", "CSplitBlob::cs_mapParts");
             }
 
-            /*
-
-            // The ConvergedManifest content hash is in the order of the map key and on the data.
-            for (const auto& iter : StructConvergedManifest.ConvergedManifestPartPtrsMap)
-                ss << iter.second->data;
-
-            StructConvergedManifest.nContentHash = Hash(ss.begin(), ss.end());
-            */
             StructConvergedManifest.ComputeConvergedContentHash();
 
             StructConvergedManifest.timestamp = GetAdjustedTime();
@@ -4809,6 +4801,9 @@ mmCSManifestsBinnedByScraper BinCScraperManifestsByScraper()
     {
         CScraperManifest& manifest = *iter->second;
 
+        // Do not consider manifests that do not have all of their parts.
+        if (!manifest.isComplete()) continue;
+
         std::string sManifestName = manifest.sCManifestName;
         int64_t nTime = manifest.nTime;
         uint256 nHash = *manifest.phash;
@@ -4843,7 +4838,7 @@ mmCSManifestsBinnedByScraper ScraperCullAndBinCScraperManifests()
 
     _log(logattribute::INFO, "ScraperDeleteCScraperManifests", "Deleting old CScraperManifests.");
 
-    LOCK2(CScraperManifest::cs_mapManifest, CSplitBlob::cs_mapParts);
+    LOCK(CScraperManifest::cs_mapManifest);
     _log(logattribute::INFO, "LOCK", "CScraperManifest::cs_mapManifest");
 
     // First check for unauthorized manifests just in case a scraper has been deauthorized.
@@ -4924,7 +4919,7 @@ mmCSManifestsBinnedByScraper ScraperCullAndBinCScraperManifests()
     // that large. (The lock on CScraperManifest::cs_mapManifest is still held from above.)
     mMapCSManifestsBinnedByScraper = BinCScraperManifestsByScraper();
 
-    _log(logattribute::INFO, "ENDLOCK2", "CScraperManifest::cs_mapManifest, CSplitBlob::cs_mapParts");
+    _log(logattribute::INFO, "ENDLOCK", "CScraperManifest::cs_mapManifest");
 
     return mMapCSManifestsBinnedByScraper;
 }
@@ -4934,29 +4929,21 @@ mmCSManifestsBinnedByScraper ScraperCullAndBinCScraperManifests()
 // ---------------------------------------------- In ---------------------------------------- Out
 bool LoadBeaconListFromConvergedManifest(const ConvergedManifest& StructConvergedManifest, ScraperBeaconMap& mBeaconMap)
 {
-    boostio::filtering_istream in;
+    // Find the beacon list.
+    auto iter = StructConvergedManifest.ConvergedManifestPartPtrsMap.find("BeaconList");
 
+    // Bail if the beacon list is not found, or the part is zero size (missing referenced part)
+    if (iter == StructConvergedManifest.ConvergedManifestPartPtrsMap.end() || iter->second->data.size() == 0)
     {
-        LOCK(CSplitBlob::cs_mapParts);
-        _log(logattribute::INFO, "LOCK", "CSplitBlob::cs_mapParts");
-
-        // Find the beacon list.
-        auto iter = StructConvergedManifest.ConvergedManifestPartPtrsMap.find("BeaconList");
-
-        // Bail if the beacon list is not found, or the part is zero size (missing referenced part)
-        if (iter == StructConvergedManifest.ConvergedManifestPartPtrsMap.end() || iter->second->data.size() == 0)
-        {
-            return false;
-        }
-
-        boostio::basic_array_source<char> input_source(&iter->second->data[0], iter->second->data.size());
-        boostio::stream<boostio::basic_array_source<char>> ingzss(input_source);
+        return false;
+    }
 
-        in.push(boostio::gzip_decompressor());
-        in.push(ingzss);
+    boostio::basic_array_source<char> input_source(&iter->second->data[0], iter->second->data.size());
+    boostio::stream<boostio::basic_array_source<char>> ingzss(input_source);
 
-        _log(logattribute::INFO, "ENDLOCK", "CSplitBlob::cs_mapParts");
-    }
+    boostio::filtering_istream in;
+    in.push(boostio::gzip_decompressor());
+    in.push(ingzss);
 
     std::string line;