Merge pull request #7096 from blockscout/vb-hide-alert

Hide indexing alert, if indexer disabled

CHANGELOG.md

@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- [#7096](https://github.com/blockscout/blockscout/pull/7096) - Hide indexing alert, if indexer disabled
 - [#7091](https://github.com/blockscout/blockscout/pull/7091) - Fix custom ABI
 - [#7062](https://github.com/blockscout/blockscout/pull/7062) - Save block count in the DB when calculated in Cache module
 - [#7008](https://github.com/blockscout/blockscout/pull/7008) - Fetch image/video content from IPFS link

apps/block_scout_web/lib/block_scout_web/controllers/api/v2/main_page_controller.ex

@@ -41,11 +41,11 @@ defmodule BlockScoutWeb.API.V2.MainPageController do
 
   def indexing_status(conn, _params) do
     indexed_ratio_blocks = Chain.indexed_ratio_blocks()
-    finished_indexing_blocks = Chain.finished_blocks_indexing?(indexed_ratio_blocks)
+    finished_indexing_blocks = Chain.finished_indexing_from_ratio?(indexed_ratio_blocks)
 
     json(conn, %{
       finished_indexing_blocks: finished_indexing_blocks,
-      finished_indexing: Chain.finished_indexing?(indexed_ratio_blocks, api?: true),
+      finished_indexing: Chain.finished_indexing?(api?: true),
       indexed_blocks_ratio: indexed_ratio_blocks,
       indexed_internal_transactions_ratio: if(finished_indexing_blocks, do: Chain.indexed_ratio_internal_transactions())
     })

apps/block_scout_web/lib/block_scout_web/counters/blocks_indexed_counter.ex

@@ -27,7 +27,7 @@ defmodule BlockScoutWeb.Counters.BlocksIndexedCounter do
   @impl true
   def init(args) do
     if @enabled do
-      Task.start_link(&calculate_blocks_indexed/0)
+      Task.start_link(&calculate_blocks_indexed_and_broadcast/0)
 
       schedule_next_consolidation()
     end
@@ -35,21 +35,19 @@ defmodule BlockScoutWeb.Counters.BlocksIndexedCounter do
     {:ok, args}
   end
 
-  def calculate_blocks_indexed do
+  def calculate_blocks_indexed_and_broadcast do
-    indexed_ratio_blocks = Chain.indexed_ratio_blocks()
+    ratio = Chain.indexed_ratio_blocks()
 
-    finished? = Chain.finished_indexing?(indexed_ratio_blocks)
+    Notifier.broadcast_indexed_ratio("blocks:indexing", ratio)
-
-    Notifier.broadcast_blocks_indexed_ratio(indexed_ratio_blocks, finished?)
   end
 
   defp schedule_next_consolidation do
-    Process.send_after(self(), :calculate_blocks_indexed, :timer.minutes(5))
+    Process.send_after(self(), :calculate_blocks_indexed_and_broadcast, :timer.minutes(5))
   end
 
   @impl true
-  def handle_info(:calculate_blocks_indexed, state) do
+  def handle_info(:calculate_blocks_indexed_and_broadcast, state) do
-    calculate_blocks_indexed()
+    calculate_blocks_indexed_and_broadcast()
 
     schedule_next_consolidation()
 

apps/block_scout_web/lib/block_scout_web/counters/internal_transactions_indexed_counter.ex

@@ -36,11 +36,9 @@ defmodule BlockScoutWeb.Counters.InternalTransactionsIndexedCounter do
   end
 
   def calculate_internal_transactions_indexed do
-    indexed_ratio_internal_transactions = Chain.indexed_ratio_internal_transactions()
+    ratio = Chain.indexed_ratio_internal_transactions()
 
-    finished? = Chain.finished_indexing?(indexed_ratio_internal_transactions)
+    Notifier.broadcast_indexed_ratio("blocks:indexing_internal_transactions", ratio)
-
-    Notifier.broadcast_internal_transactions_indexed_ratio(indexed_ratio_internal_transactions, finished?)
   end
 
   defp schedule_next_consolidation do

apps/block_scout_web/lib/block_scout_web/notifier.ex

@@ -264,22 +264,14 @@ defmodule BlockScoutWeb.Notifier do
     do: Map.has_key?(params, "verification_type") && Map.get(params, "verification_type") == type
 
   @doc """
-  Broadcast the percentage of blocks indexed so far.
+  Broadcast the percentage of blocks or pending block operations indexed so far.
   """
-  def broadcast_blocks_indexed_ratio(ratio, finished?) do
+  @spec broadcast_indexed_ratio(String.t(), Decimal.t()) ::
-    Endpoint.broadcast("blocks:indexing", "index_status", %{
+          :ok | {:error, term()}
+  def broadcast_indexed_ratio(msg, ratio) do
+    Endpoint.broadcast(msg, "index_status", %{
       ratio: Decimal.to_string(ratio),
-      finished: finished?
+      finished: Chain.finished_indexing_from_ratio?(ratio)
-    })
-  end
-
-  @doc """
-  Broadcast the percentage of pending block operations indexed so far.
-  """
-  def broadcast_internal_transactions_indexed_ratio(ratio, finished?) do
-    Endpoint.broadcast("blocks:indexing_internal_transactions", "index_status", %{
-      ratio: Decimal.to_string(ratio),
-      finished: finished?
     })
   end
 

apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex

@@ -72,13 +72,13 @@
           <%= raw(System.get_env("MAINTENANCE_ALERT_MESSAGE")) %>
         </div>
       <% end %>
-      <% indexed_ratio_blocks = Explorer.Chain.indexed_ratio_blocks() %>
+      <% indexed_ratio_blocks = Chain.indexed_ratio_blocks() %>
       <% indexed_ratio =
-      case Chain.finished_blocks_indexing?(indexed_ratio_blocks) do
+      case Chain.finished_indexing_from_ratio?(indexed_ratio_blocks) do
        false -> indexed_ratio_blocks
-       _ -> Explorer.Chain.indexed_ratio_internal_transactions()
+       _ -> Chain.indexed_ratio_internal_transactions()
       end %>
-      <%= if not Explorer.Chain.finished_indexing?(indexed_ratio_blocks) do %>
+      <%= if not Chain.finished_indexing_from_ratio?(indexed_ratio) do %>
         <div class="alert alert-warning text-center mb-0 p-3" data-seindexed_ratiolector="indexed-status">
           <%= render BlockScoutWeb.CommonComponentsView, "_loading_spinner.html" %>
           <span data-indexed-ratio-blocks="<%= indexed_ratio_blocks %>" data-indexed-ratio="<%= indexed_ratio %>"></span>

apps/explorer/lib/explorer/chain.ex

@@ -1275,9 +1275,11 @@ defmodule Explorer.Chain do
   Checks to see if the chain is down indexing based on the transaction from the
   oldest block and the pending operation
   """
-  @spec finished_internal_transactions_indexing?([api?]) :: boolean()
+  @spec finished_indexing_internal_transactions?([api?]) :: boolean()
-  def finished_internal_transactions_indexing?(options \\ []) do
+  def finished_indexing_internal_transactions?(options \\ []) do
-    internal_transactions_disabled? = System.get_env("INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER", "false") == "true"
+    internal_transactions_disabled? =
+      Application.get_env(:indexer, Indexer.Fetcher.InternalTransaction.Supervisor)[:disabled?] or
+        not Application.get_env(:indexer, Indexer.Supervisor)[:enabled]
 
     if internal_transactions_disabled? do
       true
@@ -1312,18 +1314,24 @@ defmodule Explorer.Chain do
     end
   end
 
-  def finished_blocks_indexing?(indexed_ratio_blocks) do
+  def finished_indexing_from_ratio?(ratio) do
-    Decimal.compare(indexed_ratio_blocks, 1) !== :lt
+    Decimal.compare(ratio, 1) !== :lt
   end
 
   @doc """
   Checks if indexing of blocks and internal transactions finished aka full indexing
   """
-  @spec finished_indexing?(Decimal.t(), [api?]) :: boolean()
+  @spec finished_indexing?([api?]) :: boolean()
-  def finished_indexing?(indexed_ratio_blocks, options \\ []) do
+  def finished_indexing?(options \\ []) do
-    case finished_blocks_indexing?(indexed_ratio_blocks) do
+    if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] do
+      indexed_ratio = indexed_ratio_blocks()
+
+      case finished_indexing_from_ratio?(indexed_ratio) do
         false -> false
-      _ -> finished_internal_transactions_indexing?(options)
+        _ -> finished_indexing_internal_transactions?(options)
+      end
+    else
+      true
     end
   end
 
@@ -2181,6 +2189,7 @@ defmodule Explorer.Chain do
   """
   @spec indexed_ratio_blocks() :: Decimal.t()
   def indexed_ratio_blocks do
+    if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] do
       %{min: min, max: max} = BlockNumber.get_all()
 
       min_blockchain_block_number =
@@ -2209,10 +2218,14 @@ defmodule Explorer.Chain do
           |> Decimal.round(2, :down)
           |> Decimal.min(Decimal.new(1))
       end
+    else
+      Decimal.new(1)
+    end
   end
 
   @spec indexed_ratio_internal_transactions() :: Decimal.t()
   def indexed_ratio_internal_transactions do
+    if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] do
       %{max: max} = BlockNumber.get_all()
       count = Repo.aggregate(PendingBlockOperation, :count, timeout: :infinity)
 
@@ -2234,6 +2247,9 @@ defmodule Explorer.Chain do
           |> Decimal.round(2, :down)
           |> Decimal.min(Decimal.new(1))
       end
+    else
+      Decimal.new(1)
+    end
   end
 
   @spec fetch_min_block_number() :: non_neg_integer

apps/explorer/test/explorer/chain_test.exs

@@ -1206,7 +1206,7 @@ defmodule Explorer.ChainTest do
     end
   end
 
-  describe "finished_internal_transactions_indexing?/0" do
+  describe "finished_indexing_internal_transactions?/0" do
     test "finished indexing" do
       block = insert(:block, number: 1)
 
@@ -1214,11 +1214,11 @@ defmodule Explorer.ChainTest do
       |> insert()
       |> with_block(block)
 
-      assert Chain.finished_internal_transactions_indexing?()
+      assert Chain.finished_indexing_internal_transactions?()
     end
 
     test "finished indexing (no txs)" do
-      assert Chain.finished_internal_transactions_indexing?()
+      assert Chain.finished_indexing_internal_transactions?()
     end
 
     test "not finished indexing" do
@@ -1230,7 +1230,7 @@ defmodule Explorer.ChainTest do
 
       insert(:pending_block_operation, block: block, block_number: block.number)
 
-      refute Chain.finished_internal_transactions_indexing?()
+      refute Chain.finished_indexing_internal_transactions?()
     end
   end