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.

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

mimic: mds: cleanup unneeded client_snap_caps when splitting snap inode #30234

Merged
merged 2 commits into from Oct 10, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 7, 2019

@smithfarm smithfarm added this to the mimic milestone Sep 7, 2019
@smithfarm smithfarm added the cephfs label Sep 7, 2019
@smithfarm smithfarm requested a review from ukernel Sep 7, 2019
Copy link
Member

batrick left a comment

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 23, 2019

@batrick Done

@batrick batrick dismissed their stale review Sep 24, 2019

done

@batrick batrick added the needs-qa label Sep 24, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

jenkins test make check

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc: In member function 'CInode* MDCache::cow_inode(CInode*, snapid_t)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:1589:19: error: 'vec' is not a member of 'MDSContext'
       MDSContext::vec finished;
                   ^~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:1600:68: error: 'finished' was not declared in this scope
    lock->take_waiting(SimpleLock::WAIT_STABLE|SimpleLock::WAIT_RD, finished);
                                                                    ^~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:1600:68: note: suggested alternative: 'Finisher'
    lock->take_waiting(SimpleLock::WAIT_STABLE|SimpleLock::WAIT_RD, finished);
                                                                    ^~~~~~~~
                                                                    Finisher
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:1604:26: error: 'finished' was not declared in this scope
       mds->queue_waiters(finished);
                          ^~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:1604:26: note: suggested alternative: 'Finisher'
       mds->queue_waiters(finished);
                          ^~~~~~~~
                          Finisher
src/mds/CMakeFiles/mds.dir/build.make:179: recipe for target 'src/mds/CMakeFiles/mds.dir/MDCache.cc.o' failed
make[3]: *** [src/mds/CMakeFiles/mds.dir/MDCache.cc.o] Error 1
ukernel added 2 commits May 21, 2019
Fixes: http://tracker.ceph.com/issues/39987
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit df79944)

Conflicts:
	src/mds/CInode.cc
	src/mds/MDCache.cc
commit df79944 "mds: cleanup unneeded client_snap_caps when
splitting snap inode" is incomplete.

Fixes: http://tracker.ceph.com/issues/39987
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 0a1e92a)

Conflicts:
    src/mds/MDCache.cc
- in mimic, "error: 'vec' is not a member of 'MDSContext'"
  addressed by declaring finished as list<MDSInternalContextBase*> instead of
  MDSContext::vec
@smithfarm smithfarm force-pushed the smithfarm:wip-40444-mimic branch from d535357 to e71f447 Oct 1, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

The Docs: build check failure is unrelated and addressed by #30663

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

@batrick @ukernel Please look at the Conflicts section of the new commit - it explains how I solved the build failure. The build is green now, but I'm not super-confident my fix is correct.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 7, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 7, 2019

jenkins test docs

@yuriw yuriw merged commit fd92c28 into ceph:mimic Oct 10, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-40444-mimic branch Oct 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.