Merge pull request #891 from Nordix/fix-instance-creation-nil-log

k8s-ci-robot · web-flow · commit edea56989af0 · 2021-06-02T19:09:37.000-07:00
Fix error logging for OpenStack instance creation
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -228,10 +228,11 @@ func (s *Service) createInstance(eventObject runtime.Object, clusterName string,
 	}).Extract()
 
 	if mc.ObserveRequest(err) != nil {
+		serverErr := err
 		if err = s.deletePorts(eventObject, portList); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error creating OpenStack instance: %v, error deleting ports: %v", serverErr, err)
 		}
-		return nil, fmt.Errorf("error creating Openstack instance: %v", err)
+		return nil, fmt.Errorf("error creating Openstack instance: %v", serverErr)
 	}
 	instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", TimeoutInstanceCreate)
 	instanceCreateTimeout *= time.Minute

Original file line number	Diff line number	Diff line change
`@@ -228,10 +228,11 @@ func (s *Service) createInstance(eventObject runtime.Object, clusterName string,`
`228`	`228`	`}).Extract()`
`229`	`229`
`230`	`230`	`if mc.ObserveRequest(err) != nil {`
	`231`	`+ serverErr := err`
`231`	`232`	`if err = s.deletePorts(eventObject, portList); err != nil {`
`232`		`- return nil, err`
	`233`	`+ return nil, fmt.Errorf("error creating OpenStack instance: %v, error deleting ports: %v", serverErr, err)`
`233`	`234`	`}`
`234`		`- return nil, fmt.Errorf("error creating Openstack instance: %v", err)`
	`235`	`+ return nil, fmt.Errorf("error creating Openstack instance: %v", serverErr)`
`235`	`236`	`}`
`236`	`237`	`instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", TimeoutInstanceCreate)`
`237`	`238`	`instanceCreateTimeout *= time.Minute`