Accept 404s when deleting documents

Author: jsoriano

internal/benchrunner/runners/rally/runner.go

@@ -12,6 +12,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -341,9 +342,12 @@ func (r *runner) deleteDataStreamDocs(dataStream string) error {
 		return fmt.Errorf("failed to delete data stream docs for data stream %s: %w", dataStream, err)
 	}
 	defer resp.Body.Close()
-	if resp.IsError() {
+
+	// Not found error is fine here, this means that data was already not there.
+	if resp.IsError() && resp.StatusCode != http.StatusNotFound {
 		return fmt.Errorf("failed to delete data stream docs for data stream %s: %s", dataStream, resp.String())
 	}
+
 	return nil
 }
 

internal/benchrunner/runners/system/runner.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -338,9 +339,12 @@ func (r *runner) deleteDataStreamDocs(dataStream string) error {
 		return fmt.Errorf("failed to delete docs for data stream %s: %w", dataStream, err)
 	}
 	defer resp.Body.Close()
-	if resp.IsError() {
-		return fmt.Errorf("failed to delete docs for data stream %s: %s", dataStream, resp.String())
+
+	// Not found error is fine here, this means that data was already not there.
+	if resp.IsError() && resp.StatusCode != http.StatusNotFound {
+		return fmt.Errorf("failed to delete data stream docs for data stream %s: %s", dataStream, resp.String())
 	}
+
 	return nil
 }
 

internal/testrunner/runners/system/runner.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -1160,12 +1161,13 @@ func deleteDataStreamDocs(api *elasticsearch.API, dataStream string) error {
 	body := strings.NewReader(`{ "query": { "match_all": {} } }`)
 	resp, err := api.DeleteByQuery([]string{dataStream}, body)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to delete data stream docs: %w", err)
 	}
 	defer resp.Body.Close()
 
-	if resp.IsError() {
-		return fmt.Errorf("failed to delete data stream docs: %s", resp)
+	// Not found error is fine here, this means that data was already not there.
+	if resp.IsError() && resp.StatusCode != http.StatusNotFound {
+		return fmt.Errorf("failed to delete data stream docs for data stream %s: %s", dataStream, resp.String())
 	}
 
 	return nil