Skip to content

ceph_monstore_tool: fix the illegal memory access when update_paxos#13605

Closed
hjwsm1989 wants to merge 1 commit intoceph:hammerfrom
hjwsm1989:fix-rebuild-monstore
Closed

ceph_monstore_tool: fix the illegal memory access when update_paxos#13605
hjwsm1989 wants to merge 1 commit intoceph:hammerfrom
hjwsm1989:fix-rebuild-monstore

Conversation

@hjwsm1989
Copy link
Copy Markdown
Contributor

@hjwsm1989 hjwsm1989 commented Feb 23, 2017

@hjwsm1989
Copy link
Copy Markdown
Contributor Author

@tchaikov please take a look

@tchaikov tchaikov added this to the hammer milestone Feb 23, 2017
@tchaikov
Copy link
Copy Markdown
Contributor

@hjwsm1989 before merging this PR, could you update the commit message with a "Conflicts:" section explaining why this change is not cherry-picked from master? thanks!

@smithfarm
Copy link
Copy Markdown
Contributor

It would also be nice to have a tracker issue explaining what the bug is that this is fixing.

@hjwsm1989
Copy link
Copy Markdown
Contributor Author

@tchaikov this is from the hammer branch, in this PR: #11125
i want to add commit message like this:
Conflicts:
Introduced in this hammer backport #11125, we use const char** instead of vector,which result the illegal memory access.

is that ok?

@tchaikov
Copy link
Copy Markdown
Contributor

tchaikov commented Feb 24, 2017

@hjwsm1989 i understand that you are fixing an issue introduced by #11125, but in general we tend to backport fixes from master. and this fix is only for hammer. that's why we want to explain the reason why we are not doing a cherry-pick here. so i'd recommend something like:

    Conflicts:
        we don't use C++11 in hammer. and this fix addresses the issue introduced by https://github.com/ceph/ceph/pull/11125, where we are iterating in a plain array instead of a std::vector in master. so this change is not cherry-picked from master.

i concur with @smithfarm , could you add a ticket in tracker to explain this problem addressed by the fix? thanks.

@hjwsm1989
Copy link
Copy Markdown
Contributor Author

@tchaikov ok, i will update the commit message.

@hjwsm1989 hjwsm1989 force-pushed the fix-rebuild-monstore branch from c6b4766 to 3cfa68b Compare February 24, 2017 02:32
@hjwsm1989
Copy link
Copy Markdown
Contributor Author

@smithfarm i opened an issue http://tracker.ceph.com/issues/19070

@tchaikov
Copy link
Copy Markdown
Contributor

@hjwsm1989 could you put "Fixes: http://tracker.ceph.com/issues/19070" in your commit message right before your "Signed-off-by" tag?

  Conflicts:
      we don't use C++11 in hammer. and this fix addresses the issue introduced by ceph#11125,
      where we are iterating in a plain array instead of a std::vector in master. so this change is not cherry-picked from master.

  Fixes: http://tracker.ceph.com/issues/19070
  Signed-off-by: huangjun <hjwsm1989@gmail.com>
@hjwsm1989 hjwsm1989 force-pushed the fix-rebuild-monstore branch from 3cfa68b to 8a56ac5 Compare February 24, 2017 02:58
@hjwsm1989
Copy link
Copy Markdown
Contributor Author

@tchaikov done

@tchaikov
Copy link
Copy Markdown
Contributor

thanks!

@smithfarm
Copy link
Copy Markdown
Contributor

@hjwsm1989 Thanks for the fix. We'll do some test runs on it and report back here.

@smithfarm
Copy link
Copy Markdown
Contributor

Hammer is EOL.

@smithfarm smithfarm closed this Sep 3, 2017
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.

3 participants