always set devices to failed before deleting

Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
heketi · Feb 21, 2018 · cb5e0dc · cb5e0dc
1 parent 6ec4b13
commit cb5e0dc
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
diff --git a/tests/functional/TestManyBricksVolume/tests/heketi_test.go b/tests/functional/TestManyBricksVolume/tests/heketi_test.go
@@ -12,11 +12,12 @@ package functional
 
 import (
 	"fmt"
+	"testing"
+
 	client "github.com/heketi/heketi/client/api/go-client"
 	"github.com/heketi/heketi/pkg/glusterfs/api"
 	"github.com/heketi/heketi/pkg/utils"
 	"github.com/heketi/tests"
-	"testing"
 )
 
 // These are the settings for the vagrant file
@@ -170,7 +171,24 @@ func teardownCluster(t *testing.T) {
 					go func(id string) {
 						defer deviceSg.Done()
 
-						err := heketi.DeviceDelete(id)
+						stateReq := &api.StateRequest{}
+						stateReq.State = api.EntryStateOffline
+						err := heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						stateReq.State = api.EntryStateFailed
+						err = heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						err = heketi.DeviceDelete(id)
 						if err != nil {
 							logger.Err(err)
 							deviceSg.Err(err)

diff --git a/tests/functional/TestSmokeTest/tests/heketi_test.go b/tests/functional/TestSmokeTest/tests/heketi_test.go
@@ -178,7 +178,22 @@ func teardownCluster(t *testing.T) {
 				go func(id string) {
 					defer sg.Done()
 
-					err := heketi.DeviceDelete(id)
+					stateReq := &api.StateRequest{}
+					stateReq.State = api.EntryStateOffline
+					err := heketi.DeviceState(id, stateReq)
+					if err != nil {
+						sg.Err(err)
+						return
+					}
+
+					stateReq.State = api.EntryStateFailed
+					err = heketi.DeviceState(id, stateReq)
+					if err != nil {
+						sg.Err(err)
+						return
+					}
+
+					err = heketi.DeviceDelete(id)
 					sg.Err(err)
 
 				}(device.Id)

diff --git a/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go b/tests/functional/TestVolumeNotDeletedWhenNodeIsDown/tests/heketi_test.go
@@ -173,7 +173,24 @@ func teardownCluster(t *testing.T) {
 					go func(id string) {
 						defer deviceSg.Done()
 
-						err := heketi.DeviceDelete(id)
+						stateReq := &api.StateRequest{}
+						stateReq.State = api.EntryStateOffline
+						err := heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						stateReq.State = api.EntryStateFailed
+						err = heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						err = heketi.DeviceDelete(id)
 						if err != nil {
 							logger.Err(err)
 							deviceSg.Err(err)

diff --git a/tests/functional/TestVolumeSnapshotBehavior/tests/heketi_test.go b/tests/functional/TestVolumeSnapshotBehavior/tests/heketi_test.go
@@ -172,7 +172,24 @@ func teardownCluster(t *testing.T) {
 					go func(id string) {
 						defer deviceSg.Done()
 
-						err := heketi.DeviceDelete(id)
+						stateReq := &api.StateRequest{}
+						stateReq.State = api.EntryStateOffline
+						err := heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						stateReq.State = api.EntryStateFailed
+						err = heketi.DeviceState(id, stateReq)
+						if err != nil {
+							logger.Err(err)
+							deviceSg.Err(err)
+							return
+						}
+
+						err = heketi.DeviceDelete(id)
 						if err != nil {
 							logger.Err(err)
 							deviceSg.Err(err)