Skip to content

Only use non-server generated events for max rev setting #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcellamaki merged 3 commits into from
Oct 28, 2022
Merged

Only use non-server generated events for max rev setting #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ab75ec
Update max rev tracking to only look at client generated events.
rtibbles Oct 26, 2022
17467dd
Use visibility API to better detect when a user returns to a tab.
rtibbles Oct 26, 2022
d6519c4
Filter out server generated events in server side max rev calculations.
rtibbles Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions contentcuration/contentcuration/frontend/shared/data/resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,13 @@ export const Session = new IndexedDBResource({
this.monitorKeepAlive();
window.addEventListener('focus', () => this.monitorKeepAlive());
window.addEventListener('blur', () => this.stopMonitorKeepAlive());
document.addEventListener('visibilitychange', () => {
if (document.hidden) {
this.stopMonitorKeepAlive();
} else {
this.monitorKeepAlive();
}
});
}
},
async getSession() {
Expand Down
21 changes: 3 additions & 18 deletions contentcuration/contentcuration/frontend/shared/data/serverSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ function handleMaxRevs(response, userId) {
.concat(get(response, ['data', 'successes'], [])),
'server_rev',
'desc'
);
// Ignore server generated changes, as they are applied out of order.
// This leads to a false sense of which changes we have actually seen.
).filter(c => c.created_by_id);
const channelIds = uniq(allChanges.map(c => c.channel_id)).filter(Boolean);
const maxRevs = {};
const promises = [];
Expand Down Expand Up @@ -249,25 +251,8 @@ async function syncChanges() {
.filter(([id, time]) => id && time > now - CHANNEL_SYNC_KEEP_ALIVE_INTERVAL)
.map(([id]) => id);
const channel_revs = {};
// Ensure we ask for information about our changes that are as yet unapplied
// We need to do this as server side changes are applied 'out of order' as they are generated
// already applied but can have a server_rev higher than as yet unapplied client generated
// changes. This should be cleaned up when we are able to directly communicate with the client
// via websockets and don't need to store these kind of events in the same mechanism as the change
// event log.
const unAppliedChanges = await db[CHANGES_TABLE].orderBy('server_rev')
.filter(c => c.synced && !c.errors && !c.disallowed)
.toArray();
for (let channelId of channelIds) {
channel_revs[channelId] = get(user, [MAX_REV_KEY, channelId], 0);
const unAppliedChange = unAppliedChanges.find(c => c.channel_id === channelId);
if (
unAppliedChange &&
unAppliedChange.server_rev &&
unAppliedChange.server_rev < channel_revs[channelId]
) {
channel_revs[channelId] = unAppliedChange.server_rev;
}
}

const requestPayload = {
Expand Down
8 changes: 6 additions & 2 deletions contentcuration/contentcuration/views/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ def current_user_for_context(user):

user_data = {field: getattr(user, field) for field in user_fields}

user_data["user_rev"] = Change.objects.filter(applied=True, user=user).values_list("server_rev", flat=True).order_by("-server_rev").first() or 0
user_data["user_rev"] = Change.objects.filter(
applied=True, user=user, created_by__isnull=False
).values_list("server_rev", flat=True).order_by("-server_rev").first() or 0

return json_for_parse_from_data(user_data)

Expand Down Expand Up @@ -301,7 +303,9 @@ def channel(request, channel_id):
if channel.deleted:
channel_error = 'CHANNEL_EDIT_ERROR_CHANNEL_DELETED'
else:
channel_rev = Change.objects.filter(applied=True, channel=channel).values_list("server_rev", flat=True).order_by("-server_rev").first() or 0
channel_rev = Change.objects.filter(
applied=True, channel=channel, created_by__isnull=False
).values_list("server_rev", flat=True).order_by("-server_rev").first() or 0

return render(
request,
Expand Down