From d57e98ac5e237e5f89e95ba34643215686ee6ccb Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Mon, 27 Jan 2020 18:26:23 -0500
Subject: [PATCH] fix expire test failures during overwrite

Former-commit-id: 5a8280d5772e5d185b8e4010b86f01752be5c9b5
---
 src/db.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/db.cpp b/src/db.cpp
index 519d3290e..bff6425cc 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -312,10 +312,9 @@ void genericSetKey(redisDb *db, robj *key, robj *val, int keepttl) {
     if (de == NULL) {
         dbAdd(db,key,val);
     } else {
-        dbOverwriteCore(db,de,key,val,!!g_pserver->fActiveReplica,true);
+        dbOverwriteCore(db,de,key,val,!!g_pserver->fActiveReplica,!keepttl);
     }
     incrRefCount(val);
-    if (!keepttl) removeExpire(db,key);
     signalModifiedKey(db,key);
 }