Merge branch '2.1' into develop

2017-07-06 11:25:36 +03:00
parent c6b579619a 66048cf094
commit ef73f3e217
11 changed files with 210 additions and 2 deletions
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@ -1322,6 +1322,14 @@ enum showdb_response SchemaRouterSession::parse_mapping_response(SSRBackend& bre
                              data, target->unique_name, duplicate->unique_name,
                              m_client->user, m_client->remote);
                }
+                else if (m_config->preferred_server == target)
+                {
+                    /** In conflict situations, use the preferred server */
+                    MXS_INFO("Forcing location of '%s' from '%s' to '%s'",
+                             data, m_shard.get_location(data)->unique_name,
+                             target->unique_name);
+                    m_shard.replace_location(data, target);
+                }
            }
            MXS_FREE(data);
        }