Merge branch 'STORM-1336' of https://github.com/jerrypeng/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/10f9086a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/10f9086a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/10f9086a Branch: refs/heads/master Commit: 10f9086a459f04579d953dc896706d4ee4d11397 Parents: 4699990 969ebaf Author: Boyang Jerry Peng <[email protected]> Authored: Wed Feb 17 23:01:07 2016 -0600 Committer: Boyang Jerry Peng <[email protected]> Committed: Wed Feb 17 23:01:07 2016 -0600 ---------------------------------------------------------------------- conf/cgconfig.conf.example | 41 +++ conf/defaults.yaml | 16 +- .../starter/ResourceAwareExampleTopology.java | 2 +- .../clj/org/apache/storm/daemon/supervisor.clj | 46 +++- storm-core/src/jvm/org/apache/storm/Config.java | 88 ++++++ .../container/ResourceIsolationInterface.java | 51 ++++ .../storm/container/cgroup/CgroupCenter.java | 216 +++++++++++++++ .../storm/container/cgroup/CgroupCommon.java | 270 +++++++++++++++++++ .../container/cgroup/CgroupCommonOperation.java | 81 ++++++ .../container/cgroup/CgroupCoreFactory.java | 74 +++++ .../storm/container/cgroup/CgroupManager.java | 210 +++++++++++++++ .../storm/container/cgroup/CgroupOperation.java | 79 ++++++ .../storm/container/cgroup/CgroupUtils.java | 118 ++++++++ .../apache/storm/container/cgroup/Device.java | 75 ++++++ .../storm/container/cgroup/Hierarchy.java | 130 +++++++++ .../storm/container/cgroup/SubSystem.java | 81 ++++++ .../storm/container/cgroup/SubSystemType.java | 36 +++ .../storm/container/cgroup/SystemOperation.java | 75 ++++++ .../storm/container/cgroup/core/BlkioCore.java | 213 +++++++++++++++ .../storm/container/cgroup/core/CgroupCore.java | 26 ++ .../storm/container/cgroup/core/CpuCore.java | 135 ++++++++++ .../container/cgroup/core/CpuacctCore.java | 71 +++++ .../storm/container/cgroup/core/CpusetCore.java | 209 ++++++++++++++ .../container/cgroup/core/DevicesCore.java | 189 +++++++++++++ .../container/cgroup/core/FreezerCore.java | 66 +++++ .../storm/container/cgroup/core/MemoryCore.java | 188 +++++++++++++ .../storm/container/cgroup/core/NetClsCore.java | 69 +++++ .../container/cgroup/core/NetPrioCore.java | 65 +++++ .../src/jvm/org/apache/storm/utils/Utils.java | 10 +- .../clj/org/apache/storm/supervisor_test.clj | 16 +- .../test/jvm/org/apache/storm/TestCgroups.java | 130 +++++++++ .../resource/TestResourceAwareScheduler.java | 3 + 32 files changed, 3053 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/10f9086a/storm-core/src/jvm/org/apache/storm/utils/Utils.java ----------------------------------------------------------------------
