Skip to content
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

Add shm_volume option #427

Merged
merged 9 commits into from
Dec 21, 2018
Merged

Add shm_volume option #427

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3662c46
WIP: Add shm_size option
erthalion Dec 6, 2018
28c5fc1
Add tests
erthalion Dec 19, 2018
dd05678
K8S doesn't support SizeLimit on EmptyDir
erthalion Dec 19, 2018
1da0878
Add documentation
erthalion Dec 19, 2018
1bd1456
Fix usage of removed err variable
erthalion Dec 19, 2018
3f56aec
Add ShmVolume to the configmap as a global configuration option
erthalion Dec 20, 2018
9207c87
Add documentation
erthalion Dec 21, 2018
93e1977
Make postgres container access more obvious
erthalion Dec 21, 2018
c2fb3b4
Rename shmVolume to enableShmVolume
erthalion Dec 21, 2018
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
2 changes: 1 addition & 1 deletion pkg/apis/acid.zalan.do/v1/postgresql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type PostgresSpec struct {
Tolerations []v1.Toleration `json:"tolerations,omitempty"`
Sidecars []Sidecar `json:"sidecars,omitempty"`
PodPriorityClassName string `json:"pod_priority_class_name,omitempty"`
ShmVolume bool `json:"shmVolume,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we make this name nicer?

enableSharedMemoryVolume?

ShmVolume *bool `json:"shmVolume,omitempty"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
13 changes: 12 additions & 1 deletion pkg/cluster/k8sres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
acidv1 "github.com/zalando-incubator/postgres-operator/pkg/apis/acid.zalan.do/v1"
"github.com/zalando-incubator/postgres-operator/pkg/spec"
"github.com/zalando-incubator/postgres-operator/pkg/util"
"github.com/zalando-incubator/postgres-operator/pkg/util/config"
"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
"k8s.io/apimachinery/pkg/labels"
)
Expand Down Expand Up @@ -396,6 +397,16 @@ func generateSidecarContainers(sidecars []acidv1.Sidecar,
return nil, nil
}

// Check whether or not we're requested to mount an shm volume,
// taking into account that PostgreSQL manifest has precedence.
func mountShmVolumeNeeded(opConfig config.Config, pgSpec *acidv1.PostgresSpec) bool {
if pgSpec.ShmVolume != nil {
return *pgSpec.ShmVolume
}

return opConfig.ShmVolume
}

func generatePodTemplate(
namespace string,
labels labels.Set,
Expand Down Expand Up @@ -786,7 +797,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*v1beta1.State
c.OpConfig.PodServiceAccountName,
c.OpConfig.KubeIAMRole,
effectivePodPriorityClassName,
spec.ShmVolume); err != nil {
mountShmVolumeNeeded(c.OpConfig, spec)); err != nil {
return nil, fmt.Errorf("could not generate pod template: %v", err)
}

Expand Down
1 change: 1 addition & 0 deletions pkg/util/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type Resources struct {
NodeReadinessLabel map[string]string `name:"node_readiness_label" default:""`
MaxInstances int32 `name:"max_instances" default:"-1"`
MinInstances int32 `name:"min_instances" default:"-1"`
ShmVolume bool `name:"shm_volume" default:"true"`
Copy link
Member

@Jan-M Jan-M Dec 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thing we use "enable" prefix in other config options?

enableSharedMemoryVolume ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I actually disagree. The data type itself for this value tells that it's enable/disable option, so add it to the name would be redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so the agreement is to rename it since indeed we have pretty many options following the same pattern.

}

// Auth describes authentication specific configuration parameters
Expand Down
1 change: 0 additions & 1 deletion pkg/util/constants/postgresql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ const (

ShmVolumeName = "dshm"
ShmVolumePath = "/dev/shm"
MinShmSize = 64 * 1024 * 1024
)