Remove assume offline on broadcast received

federationapi/internal/perform.go

@@ -762,8 +762,11 @@ func (r *FederationInternalAPI) PerformWakeupServers(
 
 func (r *FederationInternalAPI) MarkServersAlive(destinations []gomatrixserverlib.ServerName) {
 	for _, srv := range destinations {
-		// Check the statistics cache for the blacklist status to prevent hitting
+		// Check the statistics cache for the blacklist & assumed offline status to prevent hitting
 		// the database unnecessarily.
+		if r.statistics.ForServer(srv).AssumedOffline() {
+			_ = r.db.RemoveServerAssumedOffline(srv)
+		}
 		if r.queues.IsServerBlacklisted(srv) {
 			_ = r.db.RemoveServerFromBlacklist(srv)
 		}

federationapi/queue/queue.go

@@ -388,6 +388,7 @@ func (oqs *OutgoingQueues) RetryServer(srv gomatrixserverlib.ServerName) {
 
 	serverStatistics := oqs.statistics.ForServer(srv)
 	forceWakeup := serverStatistics.Blacklisted()
+	serverStatistics.RemoveAssumedOffline()
 	serverStatistics.RemoveBlacklist()
 	serverStatistics.ClearBackoff()
 

federationapi/statistics/statistics.go

@@ -260,6 +260,11 @@ func (s *ServerStatistics) RemoveBlacklist() {
 	s.backoffCount.Store(0)
 }
 
+// RemoveAssumedOffline removes the assumed offline status from the server.
+func (s *ServerStatistics) RemoveAssumedOffline() {
+	s.assumedOffline.Store(false)
+}
+
 // SuccessCount returns the number of successful requests. This is
 // usually useful in constructing transaction IDs.
 func (s *ServerStatistics) SuccessCount() uint32 {