Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190107

Conflicts:
	pkg/util/aliyun/aliyun.go

pkg/cloudprovider/retry.go

@@ -0,0 +1,31 @@
+package cloudprovider
+
+import (
+	"strings"
+	"time"
+)
+
+func IsError(err error, errs []string) bool {
+	for i := range errs {
+		if strings.Index(err.Error(), errs[i]) >= 0 {
+			return true
+		}
+	}
+	return false
+}
+
+func RetryOnError(tryFunc func() error, errs []string, maxTries int) error {
+	tried := 0
+	for tried < maxTries {
+		err := tryFunc()
+		if err == nil {
+			return nil
+		}
+		if err != nil && !IsError(err, errs) {
+			return err
+		}
+		tried += 1
+		time.Sleep(10 * time.Duration(tried) * time.Second)
+	}
+	return ErrTimeout
+}

pkg/compute/models/guest_actions.go

@@ -1213,7 +1213,7 @@ func (self *SGuest) StartGuestDetachdiskTask(ctx context.Context, userCred mccli
 		})
 	}
 	disk.SetStatus(userCred, DISK_DETACHING, "")
-	return self.GetDriver().StartGuestDetachdiskTask(ctx, userCred, self, taskData, "")
+	return self.GetDriver().StartGuestDetachdiskTask(ctx, userCred, self, taskData, parentTaskId)
 }
 
 func (self *SGuest) AllowPerformDetachIsolatedDevice(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {

pkg/util/aliyun/aliyun.go

@@ -83,7 +83,7 @@ func _jsonRequest(client *sdk.Client, domain string, version string, apiName str
 
 	resp, err := processCommonRequest(client, req)
 	if err != nil {
-		log.Errorf("request error %s parameters %s", err, params)
+		log.Errorf("request error %s with params %s", err, params)
 		return nil, err
 	}
 	body, err := jsonutils.Parse(resp.GetHttpContentBytes())

pkg/util/aliyun/instance.go

@@ -512,7 +512,14 @@ func (self *SInstance) AttachDisk(ctx context.Context, diskId string) error {
 }
 
 func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
-	return self.host.zone.region.DetachDisk(self.InstanceId, diskId)
+	return cloudprovider.RetryOnError(
+		func() error {
+			return self.host.zone.region.DetachDisk(self.InstanceId, diskId)
+		},
+		[]string{
+			`"Code":"InvalidOperation.Conflict"`,
+		},
+		4)
 }
 
 func (self *SRegion) GetInstance(instanceId string) (*SInstance, error) {