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

luminous: mds: track average session uptime #24421

Merged
merged 2 commits into from Oct 5, 2018

Conversation

Projects
None yet
4 participants
@vshankar
Contributor

vshankar commented Oct 4, 2018

@vshankar vshankar added the cephfs label Oct 4, 2018

@vshankar vshankar requested review from batrick and smithfarm Oct 4, 2018

@smithfarm smithfarm added this to the luminous milestone Oct 4, 2018

@smithfarm

The first commit is missing a Conflicts section:

Conflicts:
        src/mds/SessionMap.h

Please add it. Thanks!

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 4, 2018

@vshankar Note that when you cherry-pick with git cherry-pick -x, git generates the Conflicts section automatically - you just have to uncomment it.

@vshankar

This comment has been minimized.

Contributor

vshankar commented Oct 4, 2018

yeh -- slipped in this instance... will update.

vshankar added some commits Jul 24, 2018

mds: track average uptime of sessions
Average session age math improvements by Patrick.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit d2627b9)

Conflicts:
        src/mds/SessionMap.h
mds: include session uptime when diplaying session list
Fixes: http://tracker.ceph.com/issues/35937
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit b23a204)

@vshankar vshankar force-pushed the vshankar:wip-35937 branch from f0f7ea6 to a184abd Oct 4, 2018

commit message was fixed

@yuriw

This comment has been minimized.

Contributor

yuriw commented Oct 4, 2018

@batrick

This comment has been minimized.

Member

batrick commented Oct 5, 2018

@vshankar Note that when you cherry-pick with git cherry-pick -x, git generates the Conflicts section automatically - you just have to uncomment it.

Just want to point out that git always generates the commented conflicts section. -x just adds the cherry-picked line.

@batrick

This comment has been minimized.

Member

batrick commented Oct 5, 2018

(Although the man pages seem to indicate otherwise. Maybe I'm wrong...)

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 5, 2018

@batrick May be true, but for Ceph backporting I always emphasize the -x :-)

(The whole problem with "conflicted" cherry-picks getting posted without Conflicts section started when the git developers, in their wisdom, decided it would be a good idea to have that section commented out by default. Sigh.)

@batrick

batrick approved these changes Oct 5, 2018

@yuriw yuriw merged commit b13b69f into ceph:luminous Oct 5, 2018

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

@vshankar vshankar deleted the vshankar:wip-35937 branch Oct 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment