Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR #16180

Merged
merged 2 commits into from Aug 1, 2017
Merged

kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR #16180

merged 2 commits into from Aug 1, 2017

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm self-assigned this Jul 6, 2017
@smithfarm smithfarm added this to the kraken milestone Jul 6, 2017
@smithfarm
Copy link
Contributor Author 

/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc: In member function ‘void RGWDataSyncShardCR::init_lease_cr()’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc:1157:44: error: no matching function for call to ‘RGWDataSyncShardCR::spawn(boost::intrusive_ptr<RGWContinuousLeaseCR>&, bool)’
     lease_stack.reset(spawn(lease_cr, false));
                                            ^
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_sync_module.h:5:0,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_rados.h:25,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc:11:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_coroutine.h:259:23: note: candidate: RGWCoroutinesStack* RGWCoroutine::spawn(RGWCoroutine*, bool)
   RGWCoroutinesStack *spawn(RGWCoroutine *op, bool wait); /* execute on a different stack */
                       ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_coroutine.h:259:23: note:   no known conversion for argument 1 from ‘boost::intrusive_ptr<RGWContinuousLeaseCR>’ to ‘RGWCoroutine*’

@smithfarm smithfarm changed the title kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR [DNM] kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR Jul 6, 2017
@fangyuxiangGL @smithfarm
rgw: meta sync thread crash at RGWMetaSyncShardCR
d463de9 
Fixes: http://tracker.ceph.com/issues/20251

Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
(cherry picked from commit 45877d3)

Conflicts:
	src/rgw/rgw_data_sync.cc
          - kraken RGWContinuousLeaseCR() has slightly different options
	src/rgw/rgw_sync.cc
          - kraken RGWContinuousLeaseCR() has slightly different options
          - added "override" qualifier to ~RGWFetchAllMetaCR() definition
@smithfarm
Copy link
Contributor Author

Also bring in #16185 if/when it merges.

@smithfarm
rgw: lease_stack: use reset method instead of assignment
af0a6df 
It seems that the intent of 45877d3 was to
change all instances of "lease_stack = ..." to "lease_stack.reset(...)", but
this one was missed.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fc425af)

Conflicts:
	src/rgw/rgw_sync.cc (trivial)
@smithfarm smithfarm changed the title [DNM] kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR kraken: rgw: meta sync thread crash at RGWMetaSyncShardCR Jul 20, 2017
@smithfarm
Copy link
Contributor Author

This passed an RGW suite at http://tracker.ceph.com/issues/19009#note-78

@smithfarm smithfarm merged commit a57772d into ceph:kraken Aug 1, 2017
@smithfarm smithfarm deleted the wip-20347-kraken branch August 1, 2017 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbodley cbodley cbodley approved these changes

Assignees

@smithfarm smithfarm

Labels
bug-fix rgw
Projects
None yet
Milestone
kraken
3 participants
@smithfarm @cbodley @fangyuxiangGL