Skip to content

Commit

Permalink
Patch PVC when storage request is increased
Browse files Browse the repository at this point in the history
  • Loading branch information
cofyc committed Aug 13, 2020
1 parent 2af6bac commit 2e38a46
Show file tree
Hide file tree
Showing 6 changed files with 528 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkg/controller/tidbcluster/tidb_cluster_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func NewDefaultTidbClusterControl(
metaManager manager.Manager,
orphanPodsCleaner member.OrphanPodsCleaner,
pvcCleaner member.PVCCleanerInterface,
pvcResizer member.PVCResizerInterface,
pumpMemberManager manager.Manager,
tiflashMemberManager manager.Manager,
ticdcMemberManager manager.Manager,
Expand All @@ -63,6 +64,7 @@ func NewDefaultTidbClusterControl(
metaManager,
orphanPodsCleaner,
pvcCleaner,
pvcResizer,
pumpMemberManager,
tiflashMemberManager,
ticdcMemberManager,
Expand All @@ -83,6 +85,7 @@ type defaultTidbClusterControl struct {
metaManager manager.Manager
orphanPodsCleaner member.OrphanPodsCleaner
pvcCleaner member.PVCCleanerInterface
pvcResizer member.PVCResizerInterface
pumpMemberManager manager.Manager
tiflashMemberManager manager.Manager
ticdcMemberManager manager.Manager
Expand Down Expand Up @@ -247,6 +250,11 @@ func (tcc *defaultTidbClusterControl) updateTidbCluster(tc *v1alpha1.TidbCluster
}
}

// resize PVC if necessary
if err := tcc.pvcResizer.Resize(tc); err != nil {
return err
}

// syncing the some tidbcluster status attributes
// - sync tidbmonitor reference
return tcc.tidbClusterStatusManager.Sync(tc)
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/tidbcluster/tidb_cluster_control_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ func newFakeTidbClusterControl() (
discoveryManager := mm.NewFakeDiscoveryManger()
podRestarter := mm.NewFakePodRestarter()
statusManager := mm.NewFakeTidbClusterStatusManager()
pvcResizer := mm.NewFakePVCResizer()
control := NewDefaultTidbClusterControl(
tcUpdater,
pdMemberManager,
Expand All @@ -331,6 +332,7 @@ func newFakeTidbClusterControl() (
metaManager,
orphanPodCleaner,
pvcCleaner,
pvcResizer,
pumpMemberManager,
tiflashMemberManager,
ticdcMemberManager,
Expand Down
6 changes: 6 additions & 0 deletions pkg/controller/tidbcluster/tidb_cluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func NewController(
epsInformer := kubeInformerFactory.Core().V1().Endpoints()
pvcInformer := kubeInformerFactory.Core().V1().PersistentVolumeClaims()
pvInformer := kubeInformerFactory.Core().V1().PersistentVolumes()
scInformer := kubeInformerFactory.Storage().V1().StorageClasses()
podInformer := kubeInformerFactory.Core().V1().Pods()
nodeInformer := kubeInformerFactory.Core().V1().Nodes()
secretInformer := kubeInformerFactory.Core().V1().Secrets()
Expand Down Expand Up @@ -195,6 +196,11 @@ func NewController(
pvInformer.Lister(),
pvControl,
),
mm.NewPVCResizer(
kubeCli,
pvcInformer,
scInformer,
),
mm.NewPumpMemberManager(
setControl,
svcControl,
Expand Down
203 changes: 203 additions & 0 deletions pkg/manager/member/pvc_resizer.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
// Copyright 2020 PingCAP, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// See the License for the specific language governing permissions and
// limitations under the License.

package member

import (
"encoding/json"
"fmt"
"strings"

"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
"github.com/pingcap/tidb-operator/pkg/label"
"github.com/pingcap/tidb-operator/pkg/util"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
coreinformers "k8s.io/client-go/informers/core/v1"
storageinformers "k8s.io/client-go/informers/storage/v1"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
storagelisters "k8s.io/client-go/listers/storage/v1"
"k8s.io/klog"
)

// PVCResizerInterface represents the interface of PVC Resizer.
// It patches the PVCs owned by tidb cluster according to the latest
// storage request specified by the user. See
// https://github.com/pingcap/tidb-operator/issues/3004 for more details.
//
// Implementation:
//
// for every unmatched PVC (desiredCapacity != actualCapacity)
// if storageClass does not support VolumeExpansion, skip and continue
// if not patched, patch
//
// We patch all PVCs at the same time. For many cloud storage plugins (e.g.
// AWS-EBS, GCE-PD), they support online file system expansion in latest
// Kubernetes (1.15+).
//
// Limitations:
//
// - Note that the current statfulset implementation does not allow
// `volumeClaimTemplates` to be changed, so new PVCs created by statefulset
// controller will use the old storage request.
// - This is best effort, before statefulset volume resize feature (e.g.
// https://github.com/kubernetes/enhancements/pull/1848) to be implemented.
// - If the feature `ExpandInUsePersistentVolumes` is not enabled or the volume
// plugin does not support, the pod referencing the volume must be deleted and
// recreted after the `FileSystemResizePending` condition becomes true.
//
type PVCResizerInterface interface {
Resize(*v1alpha1.TidbCluster) error
}

var (
pdRequirement = util.MustNewRequirement(label.ComponentLabelKey, selection.Equals, []string{label.PDLabelVal})
tikvRequirement = util.MustNewRequirement(label.ComponentLabelKey, selection.Equals, []string{label.TiKVLabelVal})
tiflashRequirement = util.MustNewRequirement(label.ComponentLabelKey, selection.Equals, []string{label.TiFlashLabelVal})
pumpRequirement = util.MustNewRequirement(label.ComponentLabelKey, selection.Equals, []string{label.PumpLabelVal})
)

type pvcResizer struct {
kubeCli kubernetes.Interface
pvcLister corelisters.PersistentVolumeClaimLister
scLister storagelisters.StorageClassLister
}

func (p *pvcResizer) Resize(tc *v1alpha1.TidbCluster) error {
selector, err := label.New().Instance(tc.GetInstanceName()).Selector()
if err != nil {
return err
}
// patch PD PVCs
if tc.Spec.PD != nil {
if storageRequest, ok := tc.Spec.PD.Requests[corev1.ResourceStorage]; ok {
err = p.patchPVCs(tc.GetNamespace(), selector.Add(*pdRequirement), storageRequest, "")
if err != nil {
return err
}
}
}
// patch TiKV PVCs
if tc.Spec.TiKV != nil {
if storageRequest, ok := tc.Spec.TiKV.Requests[corev1.ResourceStorage]; ok {
err = p.patchPVCs(tc.GetNamespace(), selector.Add(*tikvRequirement), storageRequest, "")
if err != nil {
return err
}
}
}
// patch TiFlash PVCs
if tc.Spec.TiFlash != nil {
for i, claim := range tc.Spec.TiFlash.StorageClaims {
if storageRequest, ok := claim.Resources.Requests[corev1.ResourceStorage]; ok {
prefix := fmt.Sprintf("data%d", i)
err = p.patchPVCs(tc.GetNamespace(), selector.Add(*tiflashRequirement), storageRequest, prefix)
if err != nil {
return err
}
}
}
}
// patch Pump PVCs
if tc.Spec.Pump != nil {
if storageRequest, ok := tc.Spec.Pump.Requests[corev1.ResourceStorage]; ok {
err = p.patchPVCs(tc.GetNamespace(), selector.Add(*pumpRequirement), storageRequest, "")
if err != nil {
return err
}
}
}
return nil
}

func (p *pvcResizer) isVolumeExpansionSupported(storageClassName string) (bool, error) {
sc, err := p.scLister.Get(storageClassName)
if err != nil {
return false, err
}
if sc.AllowVolumeExpansion == nil {
return false, nil
}
return *sc.AllowVolumeExpansion, nil
}

// patchPVCs patches PVCs filtered by selector and prefix.
func (p *pvcResizer) patchPVCs(ns string, selector labels.Selector, storageRequest resource.Quantity, prefix string) error {
pvcs, err := p.pvcLister.PersistentVolumeClaims(ns).List(selector)
if err != nil {
return err
}
mergePatch, err := json.Marshal(map[string]interface{}{
"spec": map[string]interface{}{
"resources": corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: storageRequest,
},
},
},
})
if err != nil {
return err
}
for _, pvc := range pvcs {
if !strings.HasPrefix(pvc.Name, prefix) {
continue
}
if pvc.Spec.StorageClassName == nil {
klog.Warningf("PVC %s/%s has no storage class, skipped", pvc.Namespace, pvc.Name)
continue
}
volumeExpansionSupported, err := p.isVolumeExpansionSupported(*pvc.Spec.StorageClassName)
fmt.Printf("volumeExpansionSupported: %v, err: %v\n", volumeExpansionSupported, err)
if err != nil {
return err
}
if !volumeExpansionSupported {
klog.Warningf("Storage Class %q used by PVC %s/%s does not support volume expansion, skipped", *pvc.Spec.StorageClassName, pvc.Namespace, pvc.Name)
continue
}
if currentRequest, ok := pvc.Spec.Resources.Requests[corev1.ResourceStorage]; !ok || currentRequest != storageRequest {
_, err = p.kubeCli.CoreV1().PersistentVolumeClaims(pvc.Namespace).Patch(pvc.Name, types.MergePatchType, mergePatch)
if err != nil {
return err
}
klog.V(2).Infof("PVC %s/%s storage request is updated from %s to %s", pvc.Namespace, pvc.Name, currentRequest.String(), storageRequest.String())
} else {
klog.V(4).Infof("PVC %s/%s storage request is already %s, skipped", pvc.Namespace, pvc.Name, storageRequest.String())
}
}
return nil
}

func NewPVCResizer(kubeCli kubernetes.Interface, pvcInformer coreinformers.PersistentVolumeClaimInformer, storageClassInformer storageinformers.StorageClassInformer) PVCResizerInterface {
return &pvcResizer{
kubeCli: kubeCli,
pvcLister: pvcInformer.Lister(),
scLister: storageClassInformer.Lister(),
}
}

type fakePVCResizer struct {
}

func (f *fakePVCResizer) Resize(_ *v1alpha1.TidbCluster) error {
return nil
}

func NewFakePVCResizer() PVCResizerInterface {
return &fakePVCResizer{}
}
Loading

0 comments on commit 2e38a46

Please sign in to comment.