Merge pull request #2998 from danielhtshih/unstable

Fix a possible race condition of sdown event detection if sentinel's connection to master/slave/sentinel became disconnected just after the last PONG and before the next PING.
This commit is contained in:
Salvatore Sanfilippo 2016-05-05 17:16:58 +02:00
commit f5ff91f675

View File

@ -3387,6 +3387,8 @@ void sentinelCheckSubjectivelyDown(sentinelRedisInstance *ri) {
if (ri->link->act_ping_time) if (ri->link->act_ping_time)
elapsed = mstime() - ri->link->act_ping_time; elapsed = mstime() - ri->link->act_ping_time;
else if (ri->link->disconnected)
elapsed = mstime() - ri->link->last_avail_time;
/* Check if we are in need for a reconnection of one of the /* Check if we are in need for a reconnection of one of the
* links, because we are detecting low activity. * links, because we are detecting low activity.