[net processing] Synchronize cfilter request handling with block filter index.

jimpo · jnewbery · commit 5488ce98cf2d · 2020-05-12T21:50:07.000-04:00
Since the block filter index is updated asynchronously by proxy of the
ValidationInterface queue, lazily synchronize the net thread with the
block filter index in case lookups fail.
diff --git a/src/index/base.h b/src/index/base.h
@@ -84,13 +84,13 @@ class BaseIndex : public CValidationInterface
 
     virtual DB& GetDB() const = 0;
 
-    /// Get the name of the index for display in logs.
-    virtual const char* GetName() const = 0;
-
 public:
     /// Destructor interrupts sync thread if running and blocks until it exits.
     virtual ~BaseIndex();
 
+    /// Get the name of the index for display in logs.
+    virtual const char* GetName() const = 0;
+
     /// Returns whether index has completed the initial sync with the active chain.
     /// After returning true once, this function will return true on all subsequent calls.
     bool IsSynced() const { return m_synced; }
diff --git a/src/index/blockfilterindex.h b/src/index/blockfilterindex.h
@@ -47,13 +47,13 @@ class BlockFilterIndex final : public BaseIndex
 
     BaseIndex::DB& GetDB() const override { return *m_db; }
 
-    const char* GetName() const override { return m_name.c_str(); }
-
 public:
     /** Constructs the index, which becomes available to be queried. */
     explicit BlockFilterIndex(BlockFilterType filter_type,
                               size_t n_cache_size, bool f_memory = false, bool f_wipe = false);
 
+    const char* GetName() const override { return m_name.c_str(); }
+
     BlockFilterType GetFilterType() const { return m_filter_type; }
 
     /** Get a single filter by block. */
diff --git a/src/index/txindex.h b/src/index/txindex.h
@@ -30,15 +30,15 @@ class TxIndex final : public BaseIndex
 
     BaseIndex::DB& GetDB() const override;
 
-    const char* GetName() const override { return "txindex"; }
-
 public:
     /// Constructs the index, which becomes available to be queried.
     explicit TxIndex(size_t n_cache_size, bool f_memory = false, bool f_wipe = false);
 
     // Destructor is declared because this class contains a unique_ptr to an incomplete type.
     virtual ~TxIndex() override;
 
+    const char* GetName() const override { return "txindex"; }
+
     /// Look up a transaction by hash.
     ///
     /// @param[in]   tx_hash  The hash of the transaction to be returned.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2035,6 +2035,10 @@ static bool PrepareBlockFilterRequest(CNode* pfrom, const CChainParams& chain_pa
         LogPrint(BCLog::NET, "Filter index for supported type %s not found\n", BlockFilterTypeName(filter_type));
         return false;
     }
+    if (!filter_index->BlockUntilSyncedToCurrentChain()) {
+        LogPrint(BCLog::NET, "%s is not ready yet\n", filter_index->GetName());
+        return false;
+    }
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -2035,6 +2035,10 @@ static bool PrepareBlockFilterRequest(CNode* pfrom, const CChainParams& chain_pa`
`2035`	`2035`	`LogPrint(BCLog::NET, "Filter index for supported type %s not found\n", BlockFilterTypeName(filter_type));`
`2036`	`2036`	`return false;`
`2037`	`2037`	`}`
	`2038`	`+ if (!filter_index->BlockUntilSyncedToCurrentChain()) {`
	`2039`	`+ LogPrint(BCLog::NET, "%s is not ready yet\n", filter_index->GetName());`
	`2040`	`+ return false;`
	`2041`	`+ }`
`2038`	`2042`
`2039`	`2043`	`return true;`
`2040`	`2044`	`}`