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: core: mon: C_AckMarkedDown has not handled the Callback Arguments #30213

Merged
merged 1 commit into from Oct 16, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 6, 2019

@smithfarm smithfarm added this to the mimic milestone Sep 6, 2019
@smithfarm smithfarm added the core label Sep 6, 2019
@smithfarm smithfarm changed the title mimic: mon:C_AckMarkedDown has not handled the Callback Arguments mimic: core: mon: C_AckMarkedDown has not handled the Callback Arguments Sep 6, 2019
@smithfarm smithfarm requested a review from tchaikov Sep 6, 2019
} else if (r == -EAGAIN) {
osdmon->dispatch(op);
} else {
ceph_abort_msgf("C_AckMarkedDown: unknown result %d", r);

This comment has been minimized.

Copy link
@tchaikov

tchaikov Sep 6, 2019

Contributor
Suggested change
ceph_abort_msgf("C_AckMarkedDown: unknown result %d", r);
derr << "C_AckMarkedDown: unknown result " << r << dendl;
ceph_abort();
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc:1071:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (pgs_to_check.size() < g_conf->mon_clean_pg_upmaps_per_chunk * 2) {
           ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc: In member function 'virtual void C_AckMarkedDown::_finish(int)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc:2291:9: error: 'ceph_abort_msgf' was not declared in this scope
         ceph_abort_msgf("C_AckMarkedDown: unknown result %d", r);
         ^~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc:2291:9: note: suggested alternative: 'ceph_abort_msg'
         ceph_abort_msgf("C_AckMarkedDown: unknown result %d", r);
         ^~~~~~~~~~~~~~~
         ceph_abort_msg
make[3]: *** [src/mon/CMakeFiles/mon.dir/OSDMonitor.cc.o] Error 1

we don't have ceph_abort_msgf() back in mimic.

@smithfarm smithfarm force-pushed the smithfarm:wip-41449-mimic branch from 6216b09 to d8cb1ab Sep 6, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 6, 2019

@tchaikov Thanks

@smithfarm smithfarm force-pushed the smithfarm:wip-41449-mimic branch 2 times, most recently from 8f0f0bf to 7f4eb5f Sep 8, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 9, 2019

@tchaikov It doesn't like derr in this location:

/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc: In member function 'virtual void C_AckMarkedDown::_finish(int)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/OSDMonitor.cc:260:36: error: 'mon' was not declared in this scope
 #define dout_prefix _prefix(_dout, mon, osdmap)
                                    ^~~

Any idea?

} else if (r == -EAGAIN) {
osdmon->dispatch(op);
} else {
derr << "C_AckMarkedDown: unknown result" << r << dendl;

This comment has been minimized.

Copy link
@tchaikov

tchaikov Sep 10, 2019

Contributor
Suggested change
derr << "C_AckMarkedDown: unknown result" << r << dendl;
lgeneric_derr(osdmon->cct) << "C_AckMarkedDown: unknown result" << r << dendl;
in C_AckMarkedDown,we add a process that handle _finish(int) Callback Arguments

Fixes: https://tracker.ceph.com/issues/41217
Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 57e8411)

Conflicts:
	src/mon/OSDMonitor.cc
- MOSDMarkMeDown ctor takes fewer arguments in mimic
- no "ceph_abort_msgf" function in mimic
@smithfarm smithfarm force-pushed the smithfarm:wip-41449-mimic branch from 7f4eb5f to ff6a2e2 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

jenkins test docs

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

@tchaikov Please have another look?

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 11, 2019

@smithfarm pls rebase

--- pr 30213 --- pulling https://github.com/smithfarm/ceph.git branch wip-41449-mimic
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Total 5 (delta 4), reused 4 (delta 4), pack-reused 1
Unpacking objects: 100% (5/5), done.
From https://github.com/smithfarm/ceph

  • branch wip-41449-mimic -> FETCH_HEAD
    warning: Failed to merge submodule src/rocksdb (not checked out)
    CONFLICT (modify/delete): systemd/rbdmap.service deleted in ff6a2e2 and modified in HEAD. Version HEAD of systemd/rbdmap.service left in tree.
    CONFLICT (modify/delete): systemd/ceph-rbd-mirror@.service deleted in ff6a2e2 and modified in HEAD. Version HEAD of systemd/ceph-rbd-mirror@.service left in tree.
    Removing systemd/ceph-radosgw@.service
    Removing systemd/ceph-osd@.service
    Removing systemd/ceph-mon@.service
    CONFLICT (modify/delete): systemd/ceph-mgr@.service deleted in ff6a2e2 and modified in HEAD. Version HEAD of systemd/ceph-mgr@.service left in tree.
    Removing systemd/ceph-mds@.service
    Removing systemd/ceph-fuse@.service
    Removing systemd/ceph
    .....
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 11, 2019

@yuriw Sorry - my mistake. I added luminous-batch-1 on a mimic PR. Silly me!

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 13, 2019

@yuriw yuriw merged commit 4f9664c into ceph:mimic Oct 16, 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-41449-mimic branch Oct 17, 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.