Skip to content

temporarily disable cgroup limits on builds #8196

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

Merged
openshift-bot merged 1 commit into from
Mar 22, 2016
Merged

temporarily disable cgroup limits on builds #8196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pkg/build/builder/cmd/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,15 @@ func (c *builderConfig) execute(b builder) error {
}
gitClient := git.NewRepositoryWithEnv(gitEnv)

cgLimits, err := bld.GetCGroupLimits()
if err != nil {
return fmt.Errorf("failed to retrieve cgroup limits: %v", err)
}
glog.V(2).Infof("Running build with cgroup limits: %#v", *cgLimits)
/*
cgLimits, err := bld.GetCGroupLimits()
if err != nil {
return fmt.Errorf("failed to retrieve cgroup limits: %v", err)
}
glog.V(2).Infof("Running build with cgroup limits: %#v", *cgLimits)
*/

if err := b.Build(c.dockerClient, c.dockerEndpoint, c.buildsClient, c.build, gitClient, cgLimits); err != nil {
if err := b.Build(c.dockerClient, c.dockerEndpoint, c.buildsClient, c.build, gitClient, nil); err != nil {
return fmt.Errorf("build error: %v", err)
}

Expand Down
15 changes: 9 additions & 6 deletions pkg/build/builder/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,12 @@ func execPostCommitHook(client DockerClient, postCommitSpec api.BuildPostCommitS
args = append([]string{script, command[0]}, args...)
}

limits, err := GetCGroupLimits()
if err != nil {
return fmt.Errorf("read cgroup limits: %v", err)
}

/*
limits, err := GetCGroupLimits()
if err != nil {
return fmt.Errorf("read cgroup limits: %v", err)
}
*/
return dockerRun(client, docker.CreateContainerOptions{
Name: containerName,
Config: &docker.Config{
Expand All @@ -157,12 +158,14 @@ func execPostCommitHook(client DockerClient, postCommitSpec api.BuildPostCommitS
Cmd: args,
},
HostConfig: &docker.HostConfig{
// Limit container's resource allocation.
// Limit container's resource allocation.
/*
CPUShares: limits.CPUShares,
CPUPeriod: limits.CPUPeriod,
CPUQuota: limits.CPUQuota,
Memory: limits.MemoryLimitBytes,
MemorySwap: limits.MemorySwap,
*/
},
}, docker.LogsOptions{
// Stream logs to stdout and stderr.
Expand Down