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

osd: remove duplicated "commit_queued_for_journal_write" in OpTracker #21018

Merged
merged 1 commit into from Apr 13, 2018
Merged

osd: remove duplicated "commit_queued_for_journal_write" in OpTracker #21018

merged 1 commit into from Apr 13, 2018

Conversation

ashitakasam
Copy link
Contributor

Fixes: http://tracker.ceph.com/issues/23440

Signed-off-by: ashitakasam 694240887@qq.com

@ashitakasam
Copy link
Contributor Author 

                "events": [
                    {
                        "time": "2018-03-23 13:25:08.628590",
                        "event": "initiated"
                    },
                    {
                        "time": "2018-03-23 13:25:08.628590",
                        "event": "header_read"
                    },
                    {
                        "time": "2018-03-23 13:25:08.628599",
                        "event": "throttled"
                    },
                    {
                        "time": "2018-03-23 13:25:08.632225",
                        "event": "all_read"
                    },
                    {
                        "time": "2018-03-23 13:25:08.632249",
                        "event": "dispatched"
                    },
                    {
                        "time": "2018-03-23 13:25:08.632263",
                        "event": "queued_for_pg"
                    },
                    {
                        "time": "2018-03-23 13:25:08.632330",
                        "event": "reached_pg"
                    },
                    {
                        "time": "2018-03-23 13:25:08.632352",
                        "event": "started"
                    },
                    {
                        "time": "2018-03-23 13:25:09.664333",
                        "event": "commit_queued_for_journal_write"
                    },
                    {
                        "time": "2018-03-23 13:25:13.188672",
                        "event": "write_thread_in_journal_buffer"
                    },
                    {
                        "time": "2018-03-23 13:25:13.509438",
                        "event": "journaled_completion_queued"
                    },
                    {
                        "time": "2018-03-23 13:25:13.515041",
                        "event": "commit_sent"
                    },
                    {
                        "time": "2018-03-23 13:25:13.515101",
                        "event": "done"
                    }
                ]

liuchang0812
liuchang0812 reviewed Mar 23, 2018
View reviewed changes
src/os/filestore/FileJournal.cc
@@ -1609,8 +1609,6 @@ void FileJournal::submit_entry(uint64_t seq, bufferlist& e, uint32_t orig_len,
assert(e.length() > 0);
assert(e.length() < header.max_size);

if (osd_op)
osd_op->mark_event("commit_queued_for_journal_write");
Copy link
Contributor

Choose a reason for hiding this comment

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

hi @tchaikov would you mind taking a look? should we delete this event directly or use other event name? thank you

Copy link
Contributor

Choose a reason for hiding this comment

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

i think we'd better remove this one. as their timestamp should always be identical.

@ashitakasam ashitakasam changed the title tool: duplicated "commit_queued_for_journal_write" events in OpTracker osd: duplicated "commit_queued_for_journal_write" events in OpTracker Mar 23, 2018
@tchaikov tchaikov self-requested a review March 25, 2018 13:04
tchaikov
tchaikov reviewed Mar 26, 2018
View reviewed changes
Copy link
Contributor

@tchaikov tchaikov left a comment

Choose a reason for hiding this comment

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

the title of the commit message looks like a bug report. please see https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#3-describe-your-changes for how to describe your changes.

@tchaikov
Copy link
Contributor

@ashitakasam could you revise the title of your commit message so it describes your change instead of the bug symptom addressed by it?

@ashitakasam ashitakasam changed the title osd: duplicated "commit_queued_for_journal_write" events in OpTracker osd: remove "osd-op->mark_event("commit_queued_for_journal_write")" Mar 29, 2018
@ashitakasam ashitakasam changed the title osd: remove "osd-op->mark_event("commit_queued_for_journal_write")" osd: remove repeated "osd-op->mark_event("commit_queued_for_journal_write")" Mar 29, 2018
@ashitakasam ashitakasam changed the title osd: remove repeated "osd-op->mark_event("commit_queued_for_journal_write")" osd: remove duplicated "commit_queued_for_journal_write" in OpTracker Mar 29, 2018
@ashitakasam
osd: remove duplicated "commit_queued_for_journal_write" in OpTracker
9bb1fb0 
* src/os/filestore/FileJournal.cc: remove line 1612-1613 which will print "commit_queued_for_journal_write" twice.

Fixes: http://tracker.ceph.com/issues/23440
Signed-off-by: ashitakasam <694240887@qq.com>
@liuchang0812
Copy link
Contributor

@tchaikov ping

@tchaikov
Copy link
Contributor

retest this please

@tchaikov
Copy link
Contributor

http://pulpito.ceph.com/kchai-2018-04-12_15:56:07-rados-wip-kefu-testing-2018-04-12-2211-distro-basic-mira/

failed tests are

@tchaikov tchaikov merged commit 8418aa4 into ceph:master Apr 13, 2018
@ashitakasam ashitakasam deleted the wip-bug-23440 branch April 13, 2018 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liuchang0812 liuchang0812 liuchang0812 left review comments

@tchaikov tchaikov tchaikov approved these changes

Assignees
No one assigned
Labels
cleanup core needs-qa wip-kefu-testing
Projects
None yet
Milestone
No milestone
4 participants
@ashitakasam @tchaikov @liuchang0812 @batrick