You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/02/27 16:04:10 UTC
[7/8] storm git commit: Merge branch 'STORM-2333' of
https://github.com/revans2/incubator-storm into STORM-2333
Merge branch 'STORM-2333' of https://github.com/revans2/incubator-storm into STORM-2333
STORM-2333: CGroup memory and CPU metrics
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3a0e953a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3a0e953a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3a0e953a
Branch: refs/heads/master
Commit: 3a0e953a27e21fed2ddee219e8bc08e92d51d586
Parents: 34406ec c01b04d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Feb 27 09:51:56 2017 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Feb 27 09:51:56 2017 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 5 +
docs/cgroups_in_storm.md | 86 +++++++++++++-
.../container/cgroup/CgroupCoreFactory.java | 58 +++++-----
.../storm/container/cgroup/Hierarchy.java | 2 +-
.../jvm/org/apache/storm/metric/SystemBolt.java | 55 ++++-----
.../org/apache/storm/metric/api/IMetric.java | 8 ++
.../apache/storm/metric/cgroup/CGroupCpu.java | 70 ++++++++++++
.../storm/metric/cgroup/CGroupCpuGuarantee.java | 52 +++++++++
.../storm/metric/cgroup/CGroupMemoryLimit.java | 39 +++++++
.../storm/metric/cgroup/CGroupMemoryUsage.java | 39 +++++++
.../storm/metric/cgroup/CGroupMetricsBase.java | 114 +++++++++++++++++++
.../src/jvm/org/apache/storm/utils/Utils.java | 21 ++++
12 files changed, 487 insertions(+), 62 deletions(-)
----------------------------------------------------------------------