From b928359986f75350da0307ed904c5d039b25476d Mon Sep 17 00:00:00 2001
From: Daishan Peng <daishan@rancher.com>
Date: Mon, 3 Apr 2017 09:23:42 -0700
Subject: [PATCH] send error back if error has retry

---
 core/storage/storage.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/storage/storage.go b/core/storage/storage.go
index f8d98e2e..4cc827d8 100755
--- a/core/storage/storage.go
+++ b/core/storage/storage.go
@@ -15,6 +15,7 @@ import (
 	"github.com/rancher/agent/utilities/utils"
 	"golang.org/x/net/context"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -132,6 +133,9 @@ func DoVolumeRemove(volume model.Volume, storagePool model.StoragePool, progress
 		for i := 0; i < 3; i++ {
 			err := dockerClient.VolumeRemove(context.Background(), volume.Name, false)
 			if err != nil {
+				if strings.Contains(err.Error(), "Should retry") {
+					return errors.Wrap(err, constants.DoVolumeRemoveError+"Error removing volume")
+				}
 				errorList = append(errorList, err)
 			} else {
 				break