Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2297 from matrix-org/erikj/user_dir_fix 

Fix thinko in initial public room user spam
This commit is contained in:
Erik Johnston 2017-06-22 15:14:47 +01:00 committed by GitHub
parent ccfcef6b59 44c722931b
commit e204062310
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/handlers/user_directory.py
View File

@ -42,6 +42,8 @@ class UserDirectoyHandler(object):
""" """
INITIAL_SLEEP_MS = 50 INITIAL_SLEEP_MS = 50
INITIAL_SLEEP_COUNT = 100
INITIAL_BATCH_SIZE = 100
def __init__(self, hs): def __init__(self, hs):
self.store = hs.get_datastore() self.store = hs.get_datastore()
@ -126,6 +128,7 @@ class UserDirectoyHandler(object):
if not deltas: if not deltas:
return return
logger.info("Handling %d state deltas", len(deltas))
yield self._handle_deltas(deltas) yield self._handle_deltas(deltas)
self.pos = deltas[-1]["stream_id"] self.pos = deltas[-1]["stream_id"]
@ -187,9 +190,9 @@ class UserDirectoyHandler(object):
if is_public: if is_public:
yield self.store.add_users_to_public_room( yield self.store.add_users_to_public_room(
room_id, room_id,
user_ids=unhandled_users - self.initially_handled_users_in_public user_ids=user_ids - self.initially_handled_users_in_public
) )
self.initially_handled_users_in_public != unhandled_users self.initially_handled_users_in_public |= user_ids
# We now go and figure out the new users who share rooms with user entries # We now go and figure out the new users who share rooms with user entries
# We sleep aggressively here as otherwise it can starve resources. # We sleep aggressively here as otherwise it can starve resources.
@ -198,7 +201,7 @@ class UserDirectoyHandler(object):
to_update = set() to_update = set()
count = 0 count = 0
for user_id in user_ids: for user_id in user_ids:
if count % 100 == 0: if count % self.INITIAL_SLEEP_COUNT == 0:
yield sleep(self.INITIAL_SLEEP_MS / 1000.) yield sleep(self.INITIAL_SLEEP_MS / 1000.)
if not self.is_mine_id(user_id): if not self.is_mine_id(user_id):
@ -213,7 +216,7 @@ class UserDirectoyHandler(object):
if user_id == other_user_id: if user_id == other_user_id:
continue continue
if count % 100 == 0: if count % self.INITIAL_SLEEP_COUNT == 0:
yield sleep(self.INITIAL_SLEEP_MS / 1000.) yield sleep(self.INITIAL_SLEEP_MS / 1000.)
count += 1 count += 1
@ -234,13 +237,13 @@ class UserDirectoyHandler(object):
else: else:
self.initially_handled_users_share_private_room.add(user_set) self.initially_handled_users_share_private_room.add(user_set)
if len(to_insert) > 100: if len(to_insert) > self.INITIAL_BATCH_SIZE:
yield self.store.add_users_who_share_room( yield self.store.add_users_who_share_room(
room_id, not is_public, to_insert, room_id, not is_public, to_insert,
) )
to_insert.clear() to_insert.clear()
if len(to_update) > 100: if len(to_update) > self.INITIAL_BATCH_SIZE:
yield self.store.update_users_who_share_room( yield self.store.update_users_who_share_room(
room_id, not is_public, to_update, room_id, not is_public, to_update,
) )
@ -298,7 +301,7 @@ class UserDirectoyHandler(object):
room_id, self.server_name, room_id, self.server_name,
) )
if not is_in_room: if not is_in_room:
logger.debug("Server left room: %r", room_id) logger.info("Server left room: %r", room_id)
# Fetch all the users that we marked as being in user # Fetch all the users that we marked as being in user
# directory due to being in the room and then check if # directory due to being in the room and then check if
# need to remove those users or not # need to remove those users or not