diff --git a/deps/xredis-gtid b/deps/xredis-gtid index c000e050d63..d6da44877e0 160000 --- a/deps/xredis-gtid +++ b/deps/xredis-gtid @@ -1 +1 @@ -Subproject commit c000e050d635f0a261a90c1420ba5ece71b47115 +Subproject commit d6da44877e064c56bbcb1361490f24b553aa4fb4 diff --git a/src/server.c b/src/server.c index 53c4a103b6e..7862ee7228c 100644 --- a/src/server.c +++ b/src/server.c @@ -3658,7 +3658,7 @@ int mustObeyClient(client *c) { } static int shouldPropagate(int target) { - if (!server.replication_allowed || target == PROPAGATE_NONE || server.loading) + if (!server.replication_allowed || target == PROPAGATE_NONE || server.loading || server.gtid_embedded_calling) return 0; if (target & PROPAGATE_AOF) { diff --git a/src/server.h b/src/server.h index c9051fca084..3607d767b4b 100644 --- a/src/server.h +++ b/src/server.h @@ -2418,6 +2418,7 @@ struct redisServer { long long gtid_ignored_cmd_count; long long gtid_executed_cmd_count; long long gtid_sync_stat[GTID_SYNC_TYPES]; + int gtid_embedded_calling; /* importing mode */ mstime_t importing_end_time; /* in milliseconds */ int importing_expire_enabled;