github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

CommentTree.add_comments: Add orphaned comments to the tree

Browse Source 
Adding them to the tree doesn't hurt anything--they still won't be
displayed until their parent comment is in the tree, but it does allow
for easier cleanup in case comments get processed out of order. Once their
parent is added to the tree everything will be consistent and fine.
This commit is contained in:
Brian Simpson
2016-07-25 11:10:58 -07:00
parent 4bcc145941
commit 9bb3167fd5
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
r2/r2/models/comment_tree.py
View File

@@ -129,23 +129,22 @@ class CommentTreePermacache(object):
if comment._id not in cids
}
# skip adding any comments whose parents are missing from the tree
# because they will never be displayed unless the tree is rebuilt.
# check for the parent in the existing tree and in the current
# batch of comments to be added.
if not comments:
return
# warn on any comments whose parents are missing from the tree
# because they will never be displayed unless their parent is
# added. this can happen in normal operation if there are multiple
# queue consumers and a child is processed before its parent.
parent_ids = set(cids) | {comment._id for comment in comments}
orphan_comments = {
possible_orphan_comments = {
comment for comment in comments
if (comment.parent_id and comment.parent_id not in parent_ids)
}
if orphan_comments:
if possible_orphan_comments:
g.log.error("comment_tree_inconsistent: %s %s", link,
orphan_comments)
possible_orphan_comments)
g.stats.simple_event('comment_tree_inconsistent')
comments -= orphan_comments
if not comments:
return
for comment in comments:
tree.setdefault(comment.parent_id, []).append(comment._id)