opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2264 from swordqiu/hotfix/qj-qcloud-storagecache-bucket-name-too-long

Browse Source 
fix: qcloud storagecache bucket name too long
This commit is contained in:
Yousong Zhou
2019-08-14 09:51:10 +08:00
committed by GitHub
parent d13eecdd29 73cc14ed08
commit be1e7e64ae
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudprovider/objectstore.go
+2 -2
View File
@@ -28,8 +28,8 @@ import (
type TBucketACLType string
const (
// 100 MB
MAX_PUT_OBJECT_SIZEBYTES = int64(1000 * 1000 * 100)
// 50 MB
MAX_PUT_OBJECT_SIZEBYTES = int64(1000 * 1000 * 50)
// ACLDefault = TBucketACLType("default")
pkg/compute/hostdrivers/managedvirtual.go
+2 -1
View File
@@ -336,7 +336,8 @@ func (self *SManagedVirtualizationHostDriver) RequestRebuildDiskOnStorage(ctx co
func (driver *SManagedVirtualizationHostDriver) IsReachStoragecacheCapacityLimit(host *models.SHost, cachedImages []models.SCachedimage) bool {
quota := host.GetHostDriver().GetStoragecacheQuota(host)
if quota > 0 && len(cachedImages) >= quota {
log.Debugf("Cached image total: %d quota: %d", len(cachedImages), quota)
if quota > 0 && len(cachedImages)+1 >= quota {
return true
}
return false
pkg/multicloud/qcloud/storagecache.go
+4 -1
View File
@@ -167,7 +167,10 @@ func (self *SStoragecache) uploadImage(ctx context.Context, userCred mcclient.To
return "", err
}
bucketName := strings.ToLower(fmt.Sprintf("imgcache-%s-%s", self.region.GetId(), image.ImageId))
bucketName := strings.ReplaceAll(strings.ToLower(self.region.GetId()+image.ImageId), "-", "")
if len(bucketName) > 40 {
bucketName = bucketName[:40]
}
exists, _ := self.region.IBucketExist(bucketName)
if !exists {
log.Debugf("Bucket %s not exists, to create ...", bucketName)