Skip to content

Commit 78db6c2

Browse files
authored
fix(region): disk update tag (#23024)
1 parent 87dfcf7 commit 78db6c2

File tree

13 files changed

+211
-23
lines changed

13 files changed

+211
-23
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ require (
9696
k8s.io/cri-api v0.22.17
9797
k8s.io/klog/v2 v2.20.0
9898
moul.io/http2curl/v2 v2.3.0
99-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250801094022-e2b5a2bf4953
99+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250806071135-2a78d1b1ef8c
100100
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
101101
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
102102
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
103103
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
104-
yunion.io/x/pkg v1.10.4-0.20250715170922-d5b8a92716b6
104+
yunion.io/x/pkg v1.10.4-0.20250805171825-2431e10f90a9
105105
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1
106106
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833
107107
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
14081408
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
14091409
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
14101410
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1411-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250801094022-e2b5a2bf4953 h1:zOp7bc/faMqWXBtsWoGWa5l/n7PiWxopUnV1WR0K1Q0=
1412-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250801094022-e2b5a2bf4953/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
1411+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250806071135-2a78d1b1ef8c h1:tIiyoVwkYXhcu4wCnQLUDiB6NeqkuX92zvPOzB9vYz4=
1412+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250806071135-2a78d1b1ef8c/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
14131413
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
14141414
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
14151415
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
@@ -1423,8 +1423,8 @@ yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVB
14231423
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc=
14241424
yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
14251425
yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
1426-
yunion.io/x/pkg v1.10.4-0.20250715170922-d5b8a92716b6 h1:bcvKeB+j9oc1wS7/AjonkUlh+Dl6HSw/hfQuFI2JUXw=
1427-
yunion.io/x/pkg v1.10.4-0.20250715170922-d5b8a92716b6/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
1426+
yunion.io/x/pkg v1.10.4-0.20250805171825-2431e10f90a9 h1:8NuoKUPb3sHigChE6Mz6Nf9aZvM/TvORueIZAMYfPK0=
1427+
yunion.io/x/pkg v1.10.4-0.20250805171825-2431e10f90a9/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
14281428
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4=
14291429
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
14301430
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833 h1:XTFC1naKYkciCQDLm9izpzHXfTenmmtYsTpVKrsN5hE=

pkg/compute/hostdrivers/base.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ import (
3636
type SBaseHostDriver struct {
3737
}
3838

39+
func (self *SBaseHostDriver) RequestRemoteUpdateDisk(ctx context.Context, userCred mcclient.TokenCredential, storage *models.SStorage, disk *models.SDisk, replaceTags bool) error {
40+
return nil
41+
}
42+
3943
func (self *SBaseHostDriver) RequestBaremetalUnmaintence(ctx context.Context, userCred mcclient.TokenCredential, baremetal *models.SHost, task taskman.ITask) error {
4044
return errors.Wrapf(cloudprovider.ErrNotSupported, "RequestBaremetalUnmaintence")
4145
}

pkg/compute/hostdrivers/esxi.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ func (self *SESXiHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb i
5656
return nil
5757
}
5858

59+
func (self *SESXiHostDriver) RequestRemoteUpdateDisk(ctx context.Context, userCred mcclient.TokenCredential, storage *models.SStorage, disk *models.SDisk, replaceTags bool) error {
60+
return nil
61+
}
62+
5963
func (self *SESXiHostDriver) CheckAndSetCacheImage(ctx context.Context, userCred mcclient.TokenCredential, host *models.SHost, storageCache *models.SStoragecache, task taskman.ITask) error {
6064
params := task.GetParams()
6165
imageId, err := params.GetString("image_id")

pkg/compute/hostdrivers/virtualization.go

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,55 @@
1414

1515
package hostdrivers
1616

17+
import (
18+
"context"
19+
20+
"yunion.io/x/cloudmux/pkg/cloudprovider"
21+
"yunion.io/x/pkg/errors"
22+
23+
"yunion.io/x/onecloud/pkg/compute/models"
24+
"yunion.io/x/onecloud/pkg/mcclient"
25+
"yunion.io/x/onecloud/pkg/util/logclient"
26+
)
27+
1728
type SVirtualizationHostDriver struct {
1829
SBaseHostDriver
1930
}
31+
32+
func (self *SVirtualizationHostDriver) RequestRemoteUpdateDisk(ctx context.Context, userCred mcclient.TokenCredential, storage *models.SStorage, disk *models.SDisk, replaceTags bool) error {
33+
iDisk, err := disk.GetIDisk(ctx)
34+
if err != nil {
35+
return errors.Wrap(err, "GetIDisk")
36+
}
37+
38+
err = func() error {
39+
oldTags, err := iDisk.GetTags()
40+
if err != nil {
41+
if errors.Cause(err) == cloudprovider.ErrNotSupported || errors.Cause(err) == cloudprovider.ErrNotImplemented {
42+
return nil
43+
}
44+
return errors.Wrap(err, "iVM.GetTags()")
45+
}
46+
tags, err := disk.GetAllUserMetadata()
47+
if err != nil {
48+
return errors.Wrapf(err, "GetAllUserMetadata")
49+
}
50+
tagsUpdateInfo := cloudprovider.TagsUpdateInfo{OldTags: oldTags, NewTags: tags}
51+
52+
err = cloudprovider.SetTags(ctx, iDisk, storage.ManagerId, tags, replaceTags)
53+
if err != nil {
54+
if errors.Cause(err) == cloudprovider.ErrNotSupported || errors.Cause(err) == cloudprovider.ErrNotImplemented {
55+
return nil
56+
}
57+
logclient.AddSimpleActionLog(disk, logclient.ACT_UPDATE_TAGS, err, userCred, false)
58+
return errors.Wrap(err, "iVM.SetTags")
59+
}
60+
logclient.AddSimpleActionLog(disk, logclient.ACT_UPDATE_TAGS, tagsUpdateInfo, userCred, true)
61+
return nil
62+
}()
63+
if err != nil {
64+
return err
65+
}
66+
67+
return nil
68+
}

pkg/compute/models/disks.go

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -768,12 +768,28 @@ func getDiskResourceRequirements(ctx context.Context, userCred mcclient.TokenCre
768768
return req
769769
}
770770

771-
/*func (manager *SDiskManager) convertToBatchCreateData(data jsonutils.JSONObject) *jsonutils.JSONDict {
772-
diskConfig, _ := data.Get("disk")
773-
newData := data.(*jsonutils.JSONDict).CopyExcludes("disk")
774-
newData.Add(diskConfig, "disk.0")
775-
return newData
776-
}*/
771+
func (disk *SDisk) OnMetadataUpdated(ctx context.Context, userCred mcclient.TokenCredential) {
772+
if len(disk.ExternalId) == 0 || options.Options.KeepTagLocalization {
773+
return
774+
}
775+
err := disk.StartRemoteUpdateTask(ctx, userCred, true, "")
776+
if err != nil {
777+
log.Errorf("StartRemoteUpdateTask fail: %s", err)
778+
}
779+
}
780+
781+
func (disk *SDisk) StartRemoteUpdateTask(ctx context.Context, userCred mcclient.TokenCredential, replaceTags bool, parentTaskId string) error {
782+
data := jsonutils.NewDict()
783+
if replaceTags {
784+
data.Add(jsonutils.JSONTrue, "replace_tags")
785+
}
786+
task, err := taskman.TaskManager.NewTask(ctx, "DiskRemoteUpdateTask", disk, userCred, data, parentTaskId, "", nil)
787+
if err != nil {
788+
return errors.Wrap(err, "Start DiskRemoteUpdateTask")
789+
}
790+
disk.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
791+
return task.ScheduleRun(nil)
792+
}
777793

778794
func (disk *SDisk) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
779795
disk.SVirtualResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
@@ -2423,7 +2439,11 @@ func (self *SDisk) PerformSyncstatus(ctx context.Context, userCred mcclient.Toke
24232439
return nil, httperrors.NewBadRequestError("Disk has %d task active, can't sync status", count)
24242440
}
24252441

2426-
return nil, StartResourceSyncStatusTask(ctx, userCred, self, "DiskSyncstatusTask", "")
2442+
return nil, self.StartSyncstatus(ctx, userCred, "")
2443+
}
2444+
2445+
func (disk *SDisk) StartSyncstatus(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
2446+
return StartResourceSyncStatusTask(ctx, userCred, disk, "DiskSyncstatusTask", parentTaskId)
24272447
}
24282448

24292449
func (self *SDisk) PerformPurge(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {

pkg/compute/models/hostdrivers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type IHostDriver interface {
4949
// create disk
5050
RequestAllocateDiskOnStorage(ctx context.Context, userCred mcclient.TokenCredential, host *SHost, storage *SStorage, disk *SDisk, task taskman.ITask, input api.DiskAllocateInput) error
5151
RequestRebuildDiskOnStorage(ctx context.Context, host *SHost, storage *SStorage, disk *SDisk, task taskman.ITask, input api.DiskAllocateInput) error
52-
52+
RequestRemoteUpdateDisk(ctx context.Context, userCred mcclient.TokenCredential, storage *SStorage, disk *SDisk, replaceTags bool) error
5353
// delete disk
5454
RequestDeallocateDiskOnHost(ctx context.Context, host *SHost, storage *SStorage, disk *SDisk, cleanSnapshots bool, task taskman.ITask) error
5555
RequestDeallocateBackupDiskOnHost(ctx context.Context, host *SHost, storage *SStorage, disk *SDisk, task taskman.ITask) error
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// Copyright 2019 Yunion
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package disk
16+
17+
import (
18+
"context"
19+
20+
"yunion.io/x/jsonutils"
21+
"yunion.io/x/pkg/errors"
22+
23+
"yunion.io/x/onecloud/pkg/apis"
24+
api "yunion.io/x/onecloud/pkg/apis/compute"
25+
"yunion.io/x/onecloud/pkg/cloudcommon/db"
26+
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
27+
"yunion.io/x/onecloud/pkg/compute/models"
28+
"yunion.io/x/onecloud/pkg/util/logclient"
29+
)
30+
31+
type DiskRemoteUpdateTask struct {
32+
taskman.STask
33+
}
34+
35+
func init() {
36+
taskman.RegisterTask(DiskRemoteUpdateTask{})
37+
}
38+
39+
func (self *DiskRemoteUpdateTask) taskFail(ctx context.Context, disk *models.SDisk, err error) {
40+
disk.SetStatus(ctx, self.UserCred, apis.STATUS_UPDATE_TAGS_FAILED, err.Error())
41+
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
42+
}
43+
44+
func (self *DiskRemoteUpdateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
45+
disk := obj.(*models.SDisk)
46+
47+
var host *models.SHost
48+
storage, _ := disk.GetStorage()
49+
guest := disk.GetGuest()
50+
51+
if guest != nil {
52+
host, _ = guest.GetHost()
53+
} else {
54+
host, _ = storage.GetMasterHost()
55+
}
56+
57+
reason := "Cannot find host for disk"
58+
if host == nil || host.HostStatus != api.HOST_ONLINE {
59+
disk.SetStatus(ctx, self.GetUserCred(), api.DISK_READY, reason)
60+
self.SetStageFailed(ctx, jsonutils.NewString(reason))
61+
logclient.AddActionLogWithStartable(self, disk, logclient.ACT_UPDATE_TAGS, reason, self.UserCred, false)
62+
return
63+
}
64+
65+
self.StartRemoteUpdateTask(ctx, host, storage, disk)
66+
}
67+
68+
func (self *DiskRemoteUpdateTask) StartRemoteUpdateTask(ctx context.Context, host *models.SHost, storage *models.SStorage, disk *models.SDisk) {
69+
self.SetStage("OnRemoteUpdateComplete", nil)
70+
replaceTags := jsonutils.QueryBoolean(self.Params, "replace_tags", false)
71+
taskman.LocalTaskRun(self, func() (jsonutils.JSONObject, error) {
72+
driver, err := host.GetHostDriver()
73+
if err != nil {
74+
return nil, errors.Wrap(err, "GetHostDriver")
75+
}
76+
err = driver.RequestRemoteUpdateDisk(ctx, self.GetUserCred(), storage, disk, replaceTags)
77+
if err != nil {
78+
return nil, errors.Wrap(err, "RequestRemoteUpdateDisk")
79+
}
80+
return nil, nil
81+
})
82+
}
83+
84+
func (self *DiskRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
85+
self.SetStage("OnSyncStatusComplete", nil)
86+
disk.StartSyncstatus(ctx, self.UserCred, self.GetTaskId())
87+
}
88+
89+
func (self *DiskRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
90+
self.taskFail(ctx, disk, errors.Errorf(data.String()))
91+
}
92+
93+
func (self *DiskRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
94+
self.SetStageComplete(ctx, nil)
95+
}
96+
97+
func (self *DiskRemoteUpdateTask) OnSyncStatusCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
98+
self.SetStageFailed(ctx, data)
99+
}

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
18521852
# sigs.k8s.io/yaml v1.2.0
18531853
## explicit; go 1.12
18541854
sigs.k8s.io/yaml
1855-
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250801094022-e2b5a2bf4953
1855+
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250806071135-2a78d1b1ef8c
18561856
## explicit; go 1.21
18571857
yunion.io/x/cloudmux/pkg/apis
18581858
yunion.io/x/cloudmux/pkg/apis/billing
@@ -1949,7 +1949,7 @@ yunion.io/x/log/hooks
19491949
yunion.io/x/ovsdb/cli_util
19501950
yunion.io/x/ovsdb/schema/ovn_nb
19511951
yunion.io/x/ovsdb/types
1952-
# yunion.io/x/pkg v1.10.4-0.20250715170922-d5b8a92716b6
1952+
# yunion.io/x/pkg v1.10.4-0.20250805171825-2431e10f90a9
19531953
## explicit; go 1.18
19541954
yunion.io/x/pkg/appctx
19551955
yunion.io/x/pkg/errors

vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/disk.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)