From 4ccf807abc16e05323ab05a00938277fe17aaaee Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Wed, 13 Nov 2013 17:02:09 +0100
Subject: [PATCH] Sentinel: safer slave reconfig, master reported role should
 match.

---
 src/sentinel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sentinel.c b/src/sentinel.c
index d1e844a7..ab16e61a 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -1607,6 +1607,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
             /* Make sure the master is sane before reconfiguring this instance
              * into a slave. */
             if (ri->master->flags & SRI_MASTER &&
+                ri->master->role_reported == SRI_MASTER &&
                 (ri->master->flags & (SRI_S_DOWN|SRI_O_DOWN)) == 0 &&
                 (mstime() - ri->master->info_refresh) < SENTINEL_INFO_PERIOD*2)
             {