Minor tweaks to rendezvous client-side logic

Author: Jeff Yanta

pkg/code/server/messaging/internal.go

@@ -127,9 +127,16 @@ func (s *server) internallyForwardMessage(ctx context.Context, req *messagingpb.
 	}
 
 	rendezvousRecord, err := s.data.GetRendezvous(ctx, streamKey)
-	if err == nil {
+	switch err {
+	case nil:
 		log := log.WithField("receiver_address", rendezvousRecord.Address)
 
+		// Expired rendezvous record that likely wasn't cleaned up. Avoid forwarding,
+		// since we expect a broken state.
+		if time.Since(rendezvousRecord.ExpiresAt) >= 0 {
+			return nil
+		}
+
 		// We got lucky and the receiver's stream is on the same RPC server as
 		// where the message is created. No forwarding between servers is required.
 		// Note that we always use the rendezvous record as the source of truth
@@ -150,12 +157,6 @@ func (s *server) internallyForwardMessage(ctx context.Context, req *messagingpb.
 			return nil
 		}
 
-		// Expired rendezvous record that likely wasn't cleaned up. Avoid forwarding,
-		// since we expect a broken state.
-		if time.Since(rendezvousRecord.ExpiresAt) >= 0 {
-			return nil
-		}
-
 		client, err := getInternalMessagingClient(rendezvousRecord.Address)
 		if err != nil {
 			log.WithError(err).Warn("failure creating internal grpc messaging client")
@@ -188,7 +189,11 @@ func (s *server) internallyForwardMessage(ctx context.Context, req *messagingpb.
 			log.WithField("result", resp.Result).Warn("non-OK result sending redirected request")
 			return err
 		}
-	} else if err != rendezvous.ErrNotFound {
+
+	case rendezvous.ErrNotFound:
+		log.Debug("dropping message without rendezvous record")
+
+	default:
 		log.WithError(err).Warn("failure getting rendezvous record")
 		return err
 	}