diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-10 10:06:20 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-13 21:11:03 -0700 |
| commit | 5642155ba5ca9b384a7af058a6538ac00c2a592d (patch) | |
| tree | 18fed8846068159781bee3e1de0780e529b5ac12 | |
| parent | 06c65988bb0b1d1ec626fe31e9d806a1c4e24b28 (diff) | |
| download | ceph-5642155ba5ca9b384a7af058a6538ac00c2a592d.tar.gz | |
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 <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit b36338be43f43b6dd4ee87c97f2eaa23b467c386)
| -rw-r--r-- | src/messages/MPGStats.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index 633800aad15..8c40c4e56ed 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() {}; |