From bcd60c3895e683fbc8c9148b393b6fbee710f945 Mon Sep 17 00:00:00 2001
From: Robert Neumayer <robert.neumayer@oracle.com>
Date: Tue, 9 Feb 2021 16:00:19 +0100
Subject: [PATCH] Improve retry policy

---
 builder/oracle/oci/driver_oci.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/builder/oracle/oci/driver_oci.go b/builder/oracle/oci/driver_oci.go
index 257cdc2be..a0ab53aeb 100644
--- a/builder/oracle/oci/driver_oci.go
+++ b/builder/oracle/oci/driver_oci.go
@@ -4,7 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
+	"math/rand"
 	"regexp"
+	"sync/atomic"
 	"time"
 
 	"github.com/oracle/oci-go-sdk/common"
@@ -23,15 +26,23 @@ type driverOCI struct {
 var retryPolicy = &common.RetryPolicy{
 	MaximumNumberAttempts: 10,
 	ShouldRetryOperation: func(res common.OCIOperationResponse) bool {
-		if res.Error != nil {
-			return true
+		var e common.ServiceError
+		if errors.As(res.Error, &e) {
+			if e.GetHTTPStatusCode() == 429 || e.GetHTTPStatusCode() == 500 || e.GetHTTPStatusCode() == 503 {
+				return true
+			}
 		}
 		return false
 	},
-	NextDuration: func(common.OCIOperationResponse) time.Duration {
-		return 2 * time.Second
+	NextDuration: func(res common.OCIOperationResponse) time.Duration {
+		x := uint64(res.AttemptNumber)
+		d := time.Duration(math.Pow(2, float64(atomic.LoadUint64(&x)))) * time.Second
+		j := time.Duration(rand.Float64()*(2000)) * time.Millisecond
+		w := d + j
+		return w
 	},
 }
+
 var requestMetadata = common.RequestMetadata{
 	RetryPolicy: retryPolicy,
 }