test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 19:57:42 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

volume gc

Browse Source
This commit is contained in:
glyasai 2019-11-01 19:09:45 +08:00
parent 61d99e2f2d
commit 578a6d94dd
4 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/handler/service.go
View File

@ -1385,11 +1385,32 @@ func (s *ServiceAction) VolumnVar(tsv *dbmodel.TenantServiceVolume, tenantID, fi
}
}()
if tsv.VolumeName != "" {
err := db.GetManager().TenantServiceVolumeDaoTransactions(tx).DeleteModel(tsv.ServiceID, tsv.VolumeName)
if err != nil && err.Error() != gorm.ErrRecordNotFound.Error() {
volume, err := db.GetManager().TenantServiceVolumeDaoTransactions(tx).GetVolumeByServiceIDAndName(tsv.ServiceID, tsv.VolumeName)
if err != nil {
tx.Rollback()
return util.CreateAPIHandleErrorFromDBError("find volume", err)
}
if err := db.GetManager().TenantServiceVolumeDaoTransactions(tx).DeleteModel(tsv.ServiceID, tsv.VolumeName); err != nil && err.Error() != gorm.ErrRecordNotFound.Error() {
tx.Rollback()
return util.CreateAPIHandleErrorFromDBError("delete volume", err)
}
err = s.MQClient.SendBuilderTopic(gclient.TaskStruct{
Topic: gclient.WorkerTopic,
TaskType: "volume_gc",
TaskBody: map[string]interface{}{
"tenant_id": tenantID,
"service_id": volume.ServiceID,
"volume_id": volume.ID,
"volume_path": volume.VolumePath,
},
})
if err != nil {
logrus.Errorf("send 'volume_gc' task: %v", err)
tx.Rollback()
return util.CreateAPIHandleErrorFromDBError("send 'volume_gc' task", err)
}
} else {
if err := db.GetManager().TenantServiceVolumeDaoTransactions(tx).DeleteByServiceIDAndVolumePath(tsv.ServiceID, tsv.VolumePath); err != nil && err.Error() != gorm.ErrRecordNotFound.Error() {
tx.Rollback()

17
worker/discover/model/model.go
View File

@ -151,6 +151,13 @@ func NewTaskBody(taskType string, body []byte) TaskBody {
return nil
}
return b
case "volume_gc":
b := VolumeGCTaskBody{}
err := ffjson.Unmarshal(body, &b)
if err != nil {
return nil
}
return b
default:
return DefaultTaskBody{}
}
@ -317,12 +324,20 @@ type GroupStopTaskBody struct {
Strategy []string `json:"strategy"`
}
// ServiceGCTaskBody holds the request body to execute volume gc task.
// ServiceGCTaskBody holds the request body to execute service gc task.
type ServiceGCTaskBody struct {
TenantID string `json:"tenant_id"`
ServiceID string `json:"service_id"`
EventIDs []string `json:"event_ids"`
}
// VolumeGCTaskBody holds the request body to execute volume gc task.
type VolumeGCTaskBody struct {
TenantID string `json:"tenant_id"`
ServiceID string `json:"service_id"`
VolumeID int `json:"volume_id"`
VolumePath string `json:"volume_path"`
}
//DefaultTaskBody 默认操作任务主体
type DefaultTaskBody map[string]interface{}

52
worker/gc/gc.go
View File

@ -21,6 +21,8 @@ package gc
import (
"fmt"
"os"
"path"
"strings"
"github.com/Sirupsen/logrus"
eventutil "github.com/goodrain/rainbond/eventlog/util"
@ -64,11 +66,15 @@ func (g *GarbageCollector) DelLogFile(serviceGCReq model.ServiceGCTaskBody) {
// DelVolumeData -
func (g *GarbageCollector) DelVolumeData(serviceGCReq model.ServiceGCTaskBody) {
dir := fmt.Sprintf("/grdata/tenant/%s/service/%s", serviceGCReq.TenantID, serviceGCReq.ServiceID)
logrus.Infof("volume data. delete %s", dir)
if err := os.RemoveAll(dir); err != nil {
logrus.Warningf("dir: %s; remove volume data: %v", dir, err)
f := func(prefix string) {
dir := path.Join(prefix, fmt.Sprintf("tenant/%s/service/%s", serviceGCReq.TenantID, serviceGCReq.ServiceID))
logrus.Infof("volume data. delete %s", dir)
if err := os.RemoveAll(dir); err != nil {
logrus.Warningf("dir: %s; remove volume data: %v", dir, err)
}
}
f("/grdata")
f("/grlocaldata")
}
// DelPvPvcByServiceID -
@ -86,3 +92,41 @@ func (g *GarbageCollector) DelPvPvcByServiceID(serviceGCReq model.ServiceGCTaskB
logrus.Warningf("service id: %s; delete a collection fo PVC: %v", serviceGCReq.ServiceID, err)
}
}
// DelVolumeDataByVolumeID -
func (g *GarbageCollector) DelVolumeDataByVolumeID(volumeGCReq model.VolumeGCTaskBody) {
f := func(prefix string) {
dir := path.Join(prefix, fmt.Sprintf("tenant/%s/service/%s", volumeGCReq.TenantID, volumeGCReq.ServiceID), volumeGCReq.VolumePath)
logrus.Infof("volume data. delete %s", dir)
if err := os.RemoveAll(dir); err != nil {
logrus.Warningf("dir: %s; remove volume data: %v", dir, err)
}
}
f("/grdata")
f("/grlocaldata")
}
// DelPvPvcByVolumeID -
func (g *GarbageCollector) DelPvPvcByVolumeID(volumeGCReq model.VolumeGCTaskBody) {
logrus.Infof("volume id: %d; delete PV/PVC.", volumeGCReq.VolumeID)
listOpts := metav1.ListOptions{
LabelSelector: fmt.Sprintf("service_id=%s", volumeGCReq.ServiceID),
}
pvs, err := g.clientset.CoreV1().PersistentVolumes().List(listOpts)
if err != nil {
logrus.Warningf("list pvc: %v", err)
}
namePrefix := fmt.Sprintf("manual%d", volumeGCReq.VolumeID)
for _, pv := range pvs.Items {
claimRef := pv.Spec.ClaimRef
if !strings.HasPrefix(claimRef.Name, namePrefix) {
continue
}
if err := g.clientset.CoreV1().PersistentVolumeClaims(volumeGCReq.TenantID).Delete(claimRef.Name, &metav1.DeleteOptions{}); err != nil {
logrus.Warningf("volume id: %d; delete pvc: %v", volumeGCReq.VolumeID, err)
}
if err := g.clientset.CoreV1().PersistentVolumes().Delete(pv.Name, &metav1.DeleteOptions{}); err != nil {
logrus.Warningf("volume id: %d; delete pv: %v", volumeGCReq.VolumeID, err)
}
}
}

16
worker/handle/manager.go
View File

@ -119,6 +119,9 @@ func (m *Manager) AnalystToExec(task *model.Task) error {
case "service_gc":
logrus.Info("start the 'service_gc' task")
return m.ExecServiceGCTask(task)
case "volume_gc":
logrus.Info("start the 'volume_gc' task")
return m.ExecVolumeGCTask(task)
default:
logrus.Warning("task can not execute because no type is identified")
return nil
@ -454,3 +457,16 @@ func (m *Manager) ExecServiceGCTask(task *model.Task) error {
return nil
}
// ExecVolumeGCTask executes the 'volume_gc' task
func (m *Manager) ExecVolumeGCTask(task *model.Task) error {
volumeGCReq, ok := task.Body.(model.VolumeGCTaskBody)
if !ok {
return fmt.Errorf("can not convert the request body to 'VolumeGCTaskBody'")
}
m.garbageCollector.DelPvPvcByVolumeID(volumeGCReq)
m.garbageCollector.DelVolumeDataByVolumeID(volumeGCReq)
return nil
}