Call UserDirectoryHandler methods directly

Turns out that the user directory handling is fairly racey as a bunch
of stuff assumes that the processing happens on master, which it doesn't
when there is a synapse.app.user_dir worker. So lets just call the
function directly until we actually get round to fixing it, since it
doesn't make the situation any worse.

synapse/app/event_creator.py

@@ -58,6 +58,7 @@ from synapse.rest.client.v1.room import (
 )
 from synapse.server import HomeServer
 from synapse.storage.engines import create_engine
+from synapse.storage.user_directory import UserDirectoryStore
 from synapse.util.httpresourcetree import create_resource_tree
 from synapse.util.logcontext import LoggingContext
 from synapse.util.manhole import manhole
@@ -67,6 +68,7 @@ logger = logging.getLogger("synapse.app.event_creator")
 
 
 class EventCreatorSlavedStore(
+    UserDirectoryStore,
     DirectoryStore,
     SlavedTransactionStore,
     SlavedProfileStore,

synapse/handlers/profile.py

@@ -25,7 +25,6 @@ from synapse.api.errors import (
     SynapseError,
 )
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.replication.http.profile import ReplicationHandleProfileChangeRestServlet
 from synapse.types import UserID, get_domain_from_id
 
 from ._base import BaseHandler
@@ -47,10 +46,6 @@ class WorkerProfileHandler(BaseHandler):
 
         self.user_directory_handler = hs.get_user_directory_handler()
 
-        self._notify_master_profile_change = (
-            ReplicationHandleProfileChangeRestServlet.make_client(hs)
-        )
-
     @defer.inlineCallbacks
     def get_profile(self, user_id):
         target_user = UserID.from_string(user_id)
@@ -166,16 +161,10 @@ class WorkerProfileHandler(BaseHandler):
         )
 
         if self.hs.config.user_directory_search_all_users:
-            if self.hs.config.worker_app is None:
-                profile = yield self.store.get_profileinfo(target_user.localpart)
-                yield self.user_directory_handler.handle_local_profile_change(
-                    target_user.to_string(), profile
-                )
-            else:
-                yield self._notify_master_profile_change(
-                    requester=requester,
-                    user_id=target_user.to_string(),
-                )
+            profile = yield self.store.get_profileinfo(target_user.localpart)
+            yield self.user_directory_handler.handle_local_profile_change(
+                target_user.to_string(), profile
+            )
 
         yield self._update_join_states(requester, target_user)
 
@@ -225,16 +214,11 @@ class WorkerProfileHandler(BaseHandler):
             target_user.localpart, new_avatar_url
         )
 
-        if self.hs.config.worker_app is None:
+        if self.hs.config.user_directory_search_all_users:
             profile = yield self.store.get_profileinfo(target_user.localpart)
             yield self.user_directory_handler.handle_local_profile_change(
                 target_user.to_string(), profile
             )
-        else:
-            yield self._notify_master_profile_change(
-                requester=requester,
-                user_id=target_user.to_string(),
-            )
 
         yield self._update_join_states(requester, target_user)
 

synapse/replication/http/__init__.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from synapse.http.server import JsonResource
-from synapse.replication.http import federation, membership, profile, send_event
+from synapse.replication.http import federation, membership, send_event
 
 REPLICATION_PREFIX = "/_synapse/replication"
 
@@ -27,5 +27,4 @@ class ReplicationRestResource(JsonResource):
     def register_servlets(self, hs):
         send_event.register_servlets(hs, self)
         membership.register_servlets(hs, self)
-        profile.register_servlets(hs, self)
         federation.register_servlets(hs, self)

synapse/replication/http/profile.py

@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2018 New Vector Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import logging
-
-from twisted.internet import defer
-
-from synapse.http.servlet import parse_json_object_from_request
-from synapse.replication.http._base import ReplicationEndpoint
-from synapse.types import Requester, UserID
-
-logger = logging.getLogger(__name__)
-
-
-class ReplicationHandleProfileChangeRestServlet(ReplicationEndpoint):
-    """Notifies that a users profile has changed
-
-    Request format:
-
-        POST /_synapse/replication/profile_changed/:user_id
-
-        {
-            "requester": ...
-        }
-    """
-
-    NAME = "profile_changed"
-    PATH_ARGS = ("user_id",)
-
-    def __init__(self, hs):
-        super(ReplicationHandleProfileChangeRestServlet, self).__init__(hs)
-
-        self.user_directory_handler = hs.get_user_directory_handler()
-        self.store = hs.get_datastore()
-        self.clock = hs.get_clock()
-
-    @staticmethod
-    def _serialize_payload(requester, user_id):
-        """
-        Args:
-            requester (Requester)
-            user_id (str)
-        """
-
-        return {
-            "requester": requester.serialize(),
-        }
-
-    @defer.inlineCallbacks
-    def _handle_request(self, request, user_id):
-        content = parse_json_object_from_request(request)
-
-        requester = Requester.deserialize(self.store, content["requester"])
-
-        if requester.user:
-            request.authenticated_entity = requester.user.to_string()
-
-        target_user = UserID.from_string(user_id)
-
-        profile = yield self.store.get_profileinfo(target_user.localpart)
-        yield self.user_directory_handler.handle_local_profile_change(
-            user_id, profile
-        )
-
-        defer.returnValue((200, {}))
-
-
-def register_servlets(hs, http_server):
-    ReplicationHandleProfileChangeRestServlet(hs).register(http_server)