You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/08/09 12:03:16 UTC
[1/2] storm git commit: STORM-2680 : The switch to turn on-off the
cgroup in the doc should be "storm.resource.isolation.plugin.enable"
Repository: storm
Updated Branches:
refs/heads/master 2afb25830 -> 5d601e8d5
STORM-2680 : The switch to turn on-off the cgroup in the doc should be "storm.resource.isolation.plugin.enable"
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3599a2e3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3599a2e3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3599a2e3
Branch: refs/heads/master
Commit: 3599a2e3c53c5bd40c763f77ec033298d1f64995
Parents: 1c2ac2e
Author: cluo <05...@163.com>
Authored: Mon Aug 7 15:11:41 2017 +0800
Committer: cluo <05...@163.com>
Committed: Tue Aug 8 09:30:24 2017 +0800
----------------------------------------------------------------------
docs/cgroups_in_storm.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3599a2e3/docs/cgroups_in_storm.md
----------------------------------------------------------------------
diff --git a/docs/cgroups_in_storm.md b/docs/cgroups_in_storm.md
index ce86d81..0cc7b22 100644
--- a/docs/cgroups_in_storm.md
+++ b/docs/cgroups_in_storm.md
@@ -65,7 +65,7 @@ If "run as user" is enabled so that the supervisor spawns other processes as the
| Setting | Function |
|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| storm.cgroup.enable | This config is used to set whether or not cgroups will be used. Set "true" to enable use of cgroups. Set "false" to not use cgroups. When this config is set to false, unit tests related to cgroups will be skipped. Default set to "false" |
+| storm.resource.isolation.plugin.enable | This config is used to set whether or not cgroups will be used. Set "true" to enable use of cgroups. Set "false" to not use cgroups. When this config is set to false, unit tests related to cgroups will be skipped. Default set to "false" |
| storm.cgroup.hierarchy.dir | The path to the cgroup hierarchy that storm will use. Default set to "/cgroup/storm_resources" |
| storm.cgroup.resources | A list of subsystems that will be regulated by CGroups. Default set to cpu and memory. Currently only cpu and memory are supported |
| storm.supervisor.cgroup.rootdir | The root cgroup used by the supervisor. The path to the cgroup will be \<storm.cgroup.hierarchy.dir>/\<storm.supervisor.cgroup.rootdir>. Default set to "storm" |
[2/2] storm git commit: Merge branch 'master' of
https://github.com/cluo512/storm into STORM-2680-merge
Posted by ka...@apache.org.
Merge branch 'master' of https://github.com/cluo512/storm into STORM-2680-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5d601e8d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5d601e8d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5d601e8d
Branch: refs/heads/master
Commit: 5d601e8d583fcdcffa700f305ba90a3f6ffc75da
Parents: 2afb258 3599a2e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 9 21:03:01 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 9 21:03:01 2017 +0900
----------------------------------------------------------------------
docs/cgroups_in_storm.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------