Skip to content

hammer: doc: add "Upgrading to Hammer" section#11372

Merged
1 commit merged intohammerfrom
wip-17386-hammer
Oct 29, 2016
Merged

hammer: doc: add "Upgrading to Hammer" section#11372
1 commit merged intohammerfrom
wip-17386-hammer

Conversation

@tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Oct 8, 2016

@tchaikov tchaikov added this to the hammer milestone Oct 8, 2016
@tchaikov
Copy link
Contributor Author

tchaikov commented Oct 8, 2016

please note this is not a backport from master. it only applies to hammer as a workaround.

we added 3 more fields to pg_pool_t between v0.94.6 and v0.94.7, the last field is use_gmt_hitset, and a new feature bit is used to track this change. OSDMap has a field of map<int64_t,pg_pool_t>. the CRC check is added since v0.91, where the OSDMap encoding version was bumped from 8. in this change, we disable CRC check by downgrading the OSDMap encoding version to v7 if the connection.features does not have the GMT feature bit. but this could also remove information that matters that gets added after OSDMap v8. so this change can only stay in hammer.


[1] v0.94.4 is the first hammer release allowed to upgrade to jewel. see http://ceph.com/releases/v10-2-0-jewel-released/. and the encoding version of pg_pool_t was v17 then.

@ghost ghost changed the title [hammer] disable osdmap crc if features does not have CEPH_FEATURE_OSD_HITSET_GMT hammer: osd: disable osdmap crc if features does not have CEPH_FEATURE_OSD_HITSET_GMT Oct 8, 2016
@ghost
Copy link

ghost commented Oct 8, 2016

To clarify that http://tracker.ceph.com/issues/17534 was created and made to be a backport of http://tracker.ceph.com/issues/17386. It's fine that it's a workaround instead of cherry-picks. The Fixes: should be changed to http://tracker.ceph.com/issues/17534 instead.

Does that sound sensible ?

@tchaikov
Copy link
Contributor Author

tchaikov commented Oct 8, 2016

sounds very sensible!

@tchaikov tchaikov assigned ghost and athanatos and unassigned ghost Oct 8, 2016
@tchaikov
Copy link
Contributor Author

@athanatos could you take a look?

@athanatos
Copy link
Contributor

I thought we weren't going to use this approach for hammer, and instead modify jewel and newer to not include the new bits in the OSDMap until the user flips the switch on the monitor banning old nodes.

@tchaikov
Copy link
Contributor Author

got it. i will repurpose this PR for updating the document to note down the upgrade process of hammer: osd first then mon.

@tchaikov tchaikov changed the title hammer: osd: disable osdmap crc if features does not have CEPH_FEATURE_OSD_HITSET_GMT [DNM] hammer: osd: disable osdmap crc if features does not have CEPH_FEATURE_OSD_HITSET_GMT Oct 27, 2016
Fixes: http://tracker.ceph.com/issues/17534
Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov tchaikov changed the title [DNM] hammer: osd: disable osdmap crc if features does not have CEPH_FEATURE_OSD_HITSET_GMT hammer: doc: add "Upgrading to Hammer" section Oct 27, 2016
@tchaikov
Copy link
Contributor Author

@athanatos could you take a look again?

@athanatos
Copy link
Contributor

LGTM!

@tchaikov
Copy link
Contributor Author

@dachary could you take a look and merge it if appropriate? thanks

@ghost ghost merged commit f776699 into hammer Oct 29, 2016
@tchaikov tchaikov deleted the wip-17386-hammer branch November 1, 2016 05:12
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants