summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-06-10 17:39:42 +0200
committerantirez <antirez@gmail.com>2014-06-10 17:39:42 +0200
commit8ef79e72ac890b076df3f35ab8571c01848a53f1 (patch)
tree7177036431b1deb8d3437555c770244a7c9b650f
parent58799718be9e79ea9279f5cbc211ce4d483ba010 (diff)
downloadredis-8ef79e72ac890b076df3f35ab8571c01848a53f1.tar.gz
Cluster: fix an error message when logging failover auth denied.
-rw-r--r--src/cluster.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cluster.c b/src/cluster.c
index 7800ec236..227ff8bf9 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -2338,9 +2338,11 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) {
if (mstime() - node->slaveof->voted_time < server.cluster_node_timeout * 2)
{
redisLog(REDIS_WARNING,
- "Failover auth denied to %.40s: already voted for epoch %llu",
+ "Failover auth denied to %.40s: "
+ "can't vote about this master before %lld milliseconds",
node->name,
- (unsigned long long) server.cluster->currentEpoch);
+ (long long) ((server.cluster_node_timeout*2)-
+ (mstime() - node->slaveof->voted_time)));
return;
}