From b36338be43f43b6dd4ee87c97f2eaa23b467c386 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 10 Jul 2013 10:06:20 -0700 Subject: [PATCH] messages/MPGStats: do not set paxos version to osdmap epoch The PaxosServiceMessage version field is meant for client-coordinated ordering of messages when switching between monitors (and is rarely used). Do not fill it with the osdmap epoch lest it be compared to a pgmap version, which may cause the mon to (near) indefinitely put it on a wait queue until the pgmap version catches up. Backport: cuttlefish Signed-off-by: Sage Weil Reviewed-by: Greg Farnum --- src/messages/MPGStats.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index 633800aad152a..8c40c4e56ed3c 100644 --- a/src/messages/MPGStats.h +++ b/src/messages/MPGStats.h @@ -27,8 +27,12 @@ public: utime_t had_map_for; MPGStats() : PaxosServiceMessage(MSG_PGSTATS, 0) {} - MPGStats(const uuid_d& f, epoch_t e, utime_t had) : - PaxosServiceMessage(MSG_PGSTATS, e), fsid(f), epoch(e), had_map_for(had) {} + MPGStats(const uuid_d& f, epoch_t e, utime_t had) + : PaxosServiceMessage(MSG_PGSTATS, 0), + fsid(f), + epoch(e), + had_map_for(had) + {} private: ~MPGStats() {}; -- 2.39.5