Skip to content

Commit 9abb518

Browse files
authored
Fix merge error introduced in valkey-io#1186 (valkey-io#1894)
Merge error introduced in valkey-io#1186 . Prior to the merge, the time value passed to modules was a `monotime`. The merge reverts it to a wall clock time (on the sending side only). Signed-off-by: Jim Brunner <brunnerj@amazon.com>
1 parent f1934cb commit 9abb518

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/defrag.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,8 +842,7 @@ static int defragLaterItem(robj *ob, unsigned long *cursor, monotime endtime, in
842842
* callbacks. Nobody can ever have used this, i.e. accessed the key
843843
* name in the defrag module type callback. */
844844
void *sds_key_passed_as_robj = objectGetKey(ob);
845-
long long endtimeWallClock = ustime() + (endtime - getMonotonicUs());
846-
return moduleLateDefrag(sds_key_passed_as_robj, ob, cursor, endtimeWallClock, dbid);
845+
return moduleLateDefrag(sds_key_passed_as_robj, ob, cursor, endtime, dbid);
847846
} else {
848847
*cursor = 0; /* object type/encoding may have changed since we schedule it for later */
849848
}

0 commit comments

Comments
 (0)