add wait for AVAILABLE state after dbSystem update and before database update

Author: rcohenma

oci/crud_helpers.go

@@ -444,7 +444,7 @@ func FilterMissingResourceError(sync ResourceVoider, err *error) {
 
 // In the Exadata case the service return the hostname provided by the service with a suffix
 func dbSystemHostnameDiffSuppress(key string, old string, new string, d *schema.ResourceData) bool {
-	return EqualIgnoreCaseSuppressDiff(key, old, new, d) || newIsPrefixOfOldDiffSuppress(key, old, new, d)
+	return EqualIgnoreCaseSuppressDiff(key, old, new, d) || NewIsPrefixOfOldDiffSuppress(key, old, new, d)
 }
 
 func NewIsPrefixOfOldDiffSuppress(key string, old string, new string, d *schema.ResourceData) bool {
@@ -635,3 +635,24 @@ func convertResourceFieldsToDatasourceFields(resourceSchema *schema.Resource) *s
 
 	return resourceSchema
 }
+
+func getRetryPolicyWithAdditionalretryCondition(timeout time.Duration, retryConditionFunction func(oci_common.OCIOperationResponse) bool, service string) *oci_common.RetryPolicy {
+	startTime := time.Now()
+	// wait for status of the database to not be UPDATING
+	return &oci_common.RetryPolicy{
+		ShouldRetryOperation: func(response oci_common.OCIOperationResponse) bool {
+			if shouldRetry(response, false, service, startTime) {
+				return true
+			}
+			if retryConditionFunction(response) {
+				timeWaited := getElapsedRetryDuration(startTime)
+				return timeWaited < timeout
+			}
+			return false
+		},
+		NextDuration: func(response oci_common.OCIOperationResponse) time.Duration {
+			return getRetryBackoffDuration(response, false, service, startTime)
+		},
+		MaximumNumberAttempts: 0,
+	}
+}

oci/database_db_system_resource.go

@@ -765,6 +765,34 @@ func (s *DatabaseDbSystemResourceCrud) Update() error {
 
 	s.Res = &response.DbSystem
 
+	// Wait for dbSystem to not be in updating state after the update. UpdateDatabase returns 409 if the dbSystem is in Updating state
+	// We cannot use the usual waitForState logic here because a Get() before the SetData() would interfere with the subsequent Database Update
+	getDbSystemRequest := oci_database.GetDbSystemRequest{}
+
+	getDbSystemRequest.DbSystemId = s.Res.Id
+
+	dbSystemUpdating := func(response oci_common.OCIOperationResponse) bool {
+		if getDbSystemResponse, ok := response.Response.(oci_database.GetDbSystemResponse); ok {
+			if getDbSystemResponse.LifecycleState == oci_database.DbSystemLifecycleStateUpdating {
+				return true
+			}
+		}
+		return false
+	}
+
+	getDbSystemRequest.RequestMetadata.RetryPolicy = getRetryPolicyWithAdditionalretryCondition(s.D.Timeout(schema.TimeoutUpdate), dbSystemUpdating, "database")
+	getDbSystemResponse, err := s.Client.GetDbSystem(context.Background(), getDbSystemRequest)
+	if err != nil {
+		// Do SetData here in case the service returns updated values immediately on the Update request that don't need to wait for the waitForState
+		err = s.SetData()
+		if err != nil {
+			log.Printf("[ERROR] error setting data after polling error on the dbSystem: %v", err)
+		}
+		return fmt.Errorf("[ERROR] unable to get dbSystem after the update: %v", err)
+	}
+
+	s.Res = &getDbSystemResponse.DbSystem
+
 	err = s.SetData()
 	if err != nil {
 		return fmt.Errorf("[ERROR] error setting data after dbsystem update but before database update: %v", err)