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

mgr: integrate optracker in ceph-mgr #54979

Merged
merged 1 commit into from Apr 23, 2024
Merged

Conversation

pdvian
Copy link

@pdvian pdvian commented Dec 21, 2023

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

@pdvian
Copy link
Author

pdvian commented Dec 21, 2023

The commit-id 77891f9 introduces the basic optracker framework for mgr daemon. Let's discuss if it needs improvements. Also we need to discuss plan to define new op events accordingly and also how to leverage the optracking mechanism to mgr python modules.

Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First round of review done. Looks sane! just a bunch of nits.

src/common/options/global.yaml.in Outdated Show resolved Hide resolved
src/common/options/global.yaml.in Show resolved Hide resolved
src/mgr/DaemonServer.cc Outdated Show resolved Hide resolved
src/mgr/DaemonServer.cc Outdated Show resolved Hide resolved
src/mgr/DaemonServer.cc Outdated Show resolved Hide resolved
src/mgr/Mgr.h Outdated Show resolved Hide resolved
src/mgr/MgrOpRequest.cc Outdated Show resolved Hide resolved
src/mgr/MgrOpRequest.cc Outdated Show resolved Hide resolved
src/mgr/MgrOpRequest.h Outdated Show resolved Hide resolved
src/mgr/MgrOpRequest.h Outdated Show resolved Hide resolved
Copy link
Author

@pdvian pdvian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest of the changes looks good to me except Radek's new review comments. Also squash the changes to single commit. Thank you!

src/common/options/global.yaml.in Outdated Show resolved Hide resolved
@linuxkidd linuxkidd force-pushed the wip-mgr-optracker branch 3 times, most recently from fc03f65 to cf43e8e Compare January 30, 2024 00:06
Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

src/mgr/DaemonServer.cc Outdated Show resolved Hide resolved
src/mgr/MgrOpRequest.cc Show resolved Hide resolved
@rzarzynski rzarzynski added needs-qa and removed DNM labels Jan 30, 2024
@rzarzynski rzarzynski changed the title [DNM] mgr: integrate optracker in ceph-mgr mgr: integrate optracker in ceph-mgr Jan 30, 2024
@pdvian
Copy link
Author

pdvian commented Mar 14, 2024

jenkins test make check

@rzarzynski
Copy link
Contributor

Oops, might be related:

The following tests FAILED:
	 37 - unittest_admin_socket (Failed)

@rzarzynski
Copy link
Contributor

jenkins test make check

1 similar comment
@pdvian
Copy link
Author

pdvian commented Mar 20, 2024

jenkins test make check

@pdvian
Copy link
Author

pdvian commented Mar 22, 2024

@rzarzynski @linuxkidd Need final review of this PR.

Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks there is some duplication of op_tracker instances. Commented on that below.

src/common/options/global.yaml.in Outdated Show resolved Hide resolved
src/mgr/DaemonServer.cc Show resolved Hide resolved
src/mgr/DaemonServer.h Show resolved Hide resolved
src/mgr/Mgr.h Outdated
@@ -70,6 +71,10 @@ class Mgr : public AdminSocketHook {
bool initialized;
bool initializing;

private:
// -- op tracking --
OpTracker op_tracker;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, the two op_tracker are both instances.

src/mgr/DaemonServer.cc Show resolved Hide resolved
@ljflores ljflores removed the needs-qa label Mar 25, 2024
@ljflores
Copy link
Contributor

Removing "needs-qa" since it looks like there are some additional things that need to be addressed. @pdvian feel free to re-add it when you want!

Signed-off-by: Prashant D <pdhange@redhat.com>
Signed-off-by: Michael J. Kidd <linuxkidd@gmail.com>
@pdvian
Copy link
Author

pdvian commented Mar 25, 2024

It looks there is some duplication of op_tracker instances. Commented on that below.

Removed duplicate op_tracker from Mgr and re-pushed the changes.

@pdvian
Copy link
Author

pdvian commented Mar 25, 2024

Removing "needs-qa" since it looks like there are some additional things that need to be addressed. @pdvian feel free to re-add it when you want!

I have addressed the latest review comments. Kindly add this PR in next RADOS suite teuthology batch run.

@rzarzynski
Copy link
Contributor

jenkins retest this please

@rzarzynski
Copy link
Contributor

Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-api/build/../qa/tasks/vstart_runner.py", line 1546, in 
    exec_test()
  File "/home/jenkins-build/build/workspace/ceph-api/build/../qa/tasks/vstart_runner.py", line 1396, in exec_test
    remote.run(args=args, env=vstart_env, timeout=(3 * 60))
  File "/home/jenkins-build/build/workspace/ceph-api/build/../qa/tasks/vstart_runner.py", line 452, in run
    return self._do_run(**kwargs)
  File "/home/jenkins-build/build/workspace/ceph-api/build/../qa/tasks/vstart_runner.py", line 491, in _do_run
    proc.wait()
  File "/home/jenkins-build/build/workspace/ceph-api/build/../qa/tasks/vstart_runner.py", line 265, in wait
    raise CommandFailedError(self.args, self.exitstatus)
teuthology.exceptions.CommandFailedError: Command failed with status 1: '../src/vstart.sh -n --nolockdep'

@rzarzynski
Copy link
Contributor

jenkins test api

1 similar comment
@pdvian
Copy link
Author

pdvian commented Apr 2, 2024

jenkins test api

@pdvian
Copy link
Author

pdvian commented Apr 4, 2024

ceph API tests succeeded, re-triggering make check job.

@pdvian
Copy link
Author

pdvian commented Apr 4, 2024

jenkins test make check

@rzarzynski
Copy link
Contributor

@ljflores, @pdvian: am I seeing correctly this PR is ready to go?

@pdvian
Copy link
Author

pdvian commented Apr 22, 2024

@ljflores, @pdvian: am I seeing correctly this PR is ready to go?

Yes, I donot see any failures related to this PR in https://pulpito.ceph.com/?branch=wip-yuri8-testing-2024-03-25-1419.

Failure, unrelated :

  1. cephadm: Health detail: HEALTH_WARN 1/3 mons down, quorum a,c in cluster log
  2. cephadm: Health check failed: 1 osds down (OSD_DOWN) in cluster log
  3. qa/standalone/scrub/osd-scrub-repair.sh: TEST_repair_stats_ec: test 26 = 13
  4. cephadm: log_channel(cephadm) log [ERR] : Failed to connect to smithi090 (10.0.0.9). Permission denied
  5. rados/thrash: AssertionError: wait_for_recovery: failed before timeout expired
  6. cephadm/osds, cephadm/workunits: Health check failed: 1 pool(s) do not have an application enabled (POOL_APP_NOT_ENABLED) in cluster log
  7. ceph_test_lazy_omap_stats segfault while waiting for active+clean
  8. centos 9 testing reveals rocksdb "Leak_StillReachable" memory leak in mons
  9. rados/cephadm/smoke: Health check failed: 1 stray daemon(s) not managed by cephadm (CEPHADM_STRAY_DAEMON) in cluster log

Details:

  1. https://tracker.ceph.com/issues/64864 <------- New Tracker
  2. https://tracker.ceph.com/issues/64865
  3. https://tracker.ceph.com/issues/64437
  4. https://tracker.ceph.com/issues/65017
  5. https://tracker.ceph.com/issues/63198
  6. https://tracker.ceph.com/issues/64868
  7. https://tracker.ceph.com/issues/59196
  8. https://tracker.ceph.com/issues/61774
  9. https://tracker.ceph.com/issues/64872

@ljflores
Copy link
Contributor

@ljflores ljflores merged commit 43b8639 into ceph:main Apr 23, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants