From 97bf10e1da7966f46ff1ce5e7fc878bb5983e8ee Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 25 Oct 2022 13:11:37 +0300 Subject: [PATCH] replicator: Don't update user's last_update if priority doesn't change This didn't actually matter, since it was only used to check if importing should update an existing user. However, importing is only run at startup when all users have last_update=0 anyway. The following changes bring new use cases for last_update. --- src/replication/replicator/replicator-queue.c | 4 ++-- src/replication/replicator/replicator-queue.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/replication/replicator/replicator-queue.c b/src/replication/replicator/replicator-queue.c index f6bc8fdfac..5677beeab4 100644 --- a/src/replication/replicator/replicator-queue.c +++ b/src/replication/replicator/replicator-queue.c @@ -174,8 +174,8 @@ void replicator_queue_update(struct replicator_queue *queue ATTR_UNUSED, struct replicator_user *user, enum replication_priority priority) { - if (user->priority > priority) { - /* user already has a higher priority than this */ + if (user->priority >= priority) { + /* user already has at least this high priority */ return; } user->priority = priority; diff --git a/src/replication/replicator/replicator-queue.h b/src/replication/replicator/replicator-queue.h index 4fd451a3f8..5d42d26034 100644 --- a/src/replication/replicator/replicator-queue.h +++ b/src/replication/replicator/replicator-queue.h @@ -50,7 +50,7 @@ replicator_queue_lookup(struct replicator_queue *queue, const char *username); must be called to add/move the user to the proper place in the queue. */ struct replicator_user * replicator_queue_get(struct replicator_queue *queue, const char *username); -/* Update user's priority, if it isn't already higher. */ +/* Update user's priority if it's currently lower. */ void replicator_queue_update(struct replicator_queue *queue, struct replicator_user *user, enum replication_priority priority); -- 2.47.3