Filter out redundant synced peer intervals early

apps/arweave/src/ar_chunk_storage.erl

@@ -120,6 +120,9 @@ put(PaddedOffset, Chunk, StoreID) ->
 put(PaddedOffset, Chunk, Packing, StoreID) ->
 	GenServerID = name(StoreID),
 	case catch gen_server:call(GenServerID, {put, PaddedOffset, Chunk, Packing}, 180_000) of
+		{'EXIT', {shutdown, {gen_server, call, _}}} ->
+			%% Handle to avoid the large badmatch log on shutdown.
+			{error, shutdown};
 		{'EXIT', {timeout, {gen_server, call, _}}} ->
 			?LOG_ERROR([{event, gen_server_timeout_putting_chunk},
 				{padded_offset, PaddedOffset},
@@ -254,6 +257,9 @@ delete(Offset) ->
 delete(PaddedOffset, StoreID) ->
 	GenServerID = name(StoreID),
 	case catch gen_server:call(GenServerID, {delete, PaddedOffset}, 20000) of
+		{'EXIT', {shutdown, {gen_server, call, _}}} ->
+			%% Handle to avoid the large badmatch log on shutdown.
+			{error, shutdown};
 		{'EXIT', {timeout, {gen_server, call, _}}} ->
 			{error, timeout};
 		Reply ->

apps/arweave/src/ar_peer_intervals.erl

@@ -93,19 +93,21 @@ fetch_peer_intervals(Parent, Start, Peers, UnsyncedIntervals, AllPeersIntervals)
 			end,
 			Peers
 		),
-	EnqueueIntervals =
+	{EnqueueIntervals, _} =
 		lists:foldl(
-			fun	({Peer, SoughtIntervals, _, _}, Acc) ->
-					case ar_intervals:is_empty(SoughtIntervals) of
+			fun	({Peer, SoughtIntervals, _, _}, {Acc, AlreadyPicked}) ->
+					SoughtIntervals2 = ar_intervals:outerjoin(AlreadyPicked, SoughtIntervals),
+					AlreadyPicked2 = ar_intervals:union(SoughtIntervals2, AlreadyPicked),
+					case ar_intervals:is_empty(SoughtIntervals2) of
 						true ->
-							Acc;
+							{Acc, AlreadyPicked2};
 						false ->
-							[{Peer, SoughtIntervals} | Acc]
+							{[{Peer, SoughtIntervals2} | Acc], AlreadyPicked2}
 					end;
 				(_, Acc) ->
 					Acc
 			end,
-			[],
+			{[], ar_intervals:new()},
 			Intervals
 		),
 	gen_server:cast(Parent, {enqueue_intervals, EnqueueIntervals}),