Merge pull request #490 from v3io/development

Development

Author: dinal

Diff for: pkg/tsdb/v3iotsdb.go

@@ -478,10 +478,11 @@ func deleteEntirePartition(logger logger.Logger, container v3io.Container, parti
 	err := utils.DeleteTable(logger, container, partitionPath, "", workers)
 	if err != nil {
 		errChannel <- errors.Wrapf(err, "Failed to delete partition '%s'.", partitionPath)
+		return
 	}
 	// Delete the Directory object
 	err = container.DeleteObjectSync(&v3io.DeleteObjectInput{Path: partitionPath})
-	if err != nil {
+	if err != nil && !utils.IsNotExistsError(err) {
 		errChannel <- errors.Wrapf(err, "Failed to delete partition folder '%s'.", partitionPath)
 	}
 }

Diff for: pkg/utils/container.go

@@ -22,7 +22,6 @@ package utils
 
 import (
 	"encoding/binary"
-	"fmt"
 	"net/url"
 	"strings"
 	"time"
@@ -124,18 +123,17 @@ func DeleteTable(logger logger.Logger, container v3io.Container, path, filter st
 
 	responseChan := make(chan *v3io.Response, 1000)
 	commChan := make(chan int, 2)
-	doneChan := respWaitLoop(commChan, responseChan, 10*time.Second)
-	reqMap := map[uint64]bool{}
+	doneChan := make(chan error, 1)
+	go respWaitLoop(commChan, responseChan, doneChan, 10*time.Second)
 
 	i := 0
 	for iter.Next() {
 		name := iter.GetField(config.ObjectNameAttrName).(string)
-		req, err := container.DeleteObject(&v3io.DeleteObjectInput{Path: path + "/" + name}, nil, responseChan)
+		_, err := container.DeleteObject(&v3io.DeleteObjectInput{Path: path + "/" + name}, nil, responseChan)
 		if err != nil {
 			commChan <- i
 			return errors.Wrapf(err, "Failed to delete object '%s'.", name)
 		}
-		reqMap[req.ID] = true
 		i++
 	}
 
@@ -144,50 +142,44 @@ func DeleteTable(logger logger.Logger, container v3io.Container, path, filter st
 		return errors.Wrap(iter.Err(), "Failed to delete object.")
 	}
 
-	<-doneChan
-
-	return nil
+	return <-doneChan
 }
 
-func respWaitLoop(comm chan int, responseChan chan *v3io.Response, timeout time.Duration) chan bool {
+func respWaitLoop(comm <-chan int, responseChan <-chan *v3io.Response, doneChan chan<- error, timeout time.Duration) {
 	responses := 0
 	requests := -1
-	done := make(chan bool)
-
-	go func() {
-		active := false
-		for {
-			select {
-
-			case resp := <-responseChan:
-				responses++
-				active = true
-
-				if resp.Error != nil {
-					fmt.Println(resp.Error, "Failed to receive a response to delete request.")
-				}
-
-				if requests == responses {
-					done <- true
-					return
-				}
-
-			case requests = <-comm:
-				if requests <= responses {
-					done <- true
-					return
-				}
-
-			case <-time.After(timeout):
-				if !active {
-					fmt.Println("\nResponse loop timed out.", requests, responses)
-					done <- true
-					return
-				}
-				active = false
+
+	active := false
+	for {
+		select {
+
+		case resp := <-responseChan:
+			responses++
+			active = true
+
+			if resp.Error != nil && !IsNotExistsError(resp.Error) {
+				doneChan <- resp.Error
+				return
+			}
+
+			if requests == responses {
+				doneChan <- nil
+				return
+			}
+
+		case requests = <-comm:
+			if requests <= responses {
+				doneChan <- nil
+				return
 			}
-		}
-	}()
 
-	return done
+		case <-time.After(timeout):
+			if !active {
+				err := errors.Errorf("\nResponse loop timed out with request=%d, responses=%d", requests, responses)
+				doneChan <- err
+				return
+			}
+			active = false
+		}
+	}
 }

Diff for: pkg/utils/labels.go

@@ -65,40 +65,47 @@ func (ls Labels) Filter(keep []string) LabelsIfc {
 
 // convert Label set to a string in the form key1=v1,key2=v2.. + name + hash
 func (ls Labels) GetKey() (string, string, uint64) {
-	key := ""
+	var keyBuilder strings.Builder
 	name := ""
 	for _, lbl := range ls {
 		if lbl.Name == MetricName {
 			name = lbl.Value
 		} else {
-			key = key + lbl.Name + "=" + lbl.Value + ","
+			keyBuilder.WriteString(lbl.Name)
+			keyBuilder.WriteString("=")
+			keyBuilder.WriteString(lbl.Value)
+			keyBuilder.WriteString(",")
 		}
 	}
-	if len(key) == 0 {
+	if keyBuilder.Len() == 0 {
 		return name, "", ls.Hash()
 	}
-	return name, key[:len(key)-1], ls.Hash()
+
+	// Discard last comma
+	key := keyBuilder.String()[:keyBuilder.Len()-1]
+
+	return name, key, ls.Hash()
 
 }
 
 // create update expression
 func (ls Labels) GetExpr() string {
-	lblexpr := ""
+	var lblExprBuilder strings.Builder
 	for _, lbl := range ls {
 		if lbl.Name != MetricName {
-			lblexpr = lblexpr + fmt.Sprintf("%s='%s'; ", lbl.Name, lbl.Value)
+			fmt.Fprintf(&lblExprBuilder, "%s='%s'; ", lbl.Name, lbl.Value)
 		} else {
-			lblexpr = lblexpr + fmt.Sprintf("_name='%s'; ", lbl.Value)
+			fmt.Fprintf(&lblExprBuilder, "_name='%s'; ", lbl.Value)
 		}
 	}
 
-	return lblexpr
+	return lblExprBuilder.String()
 }
 
 func (ls Labels) LabelNames() []string {
-	var res []string
-	for _, l := range ls {
-		res = append(res, l.Name)
+	res := make([]string, len(ls))
+	for i, l := range ls {
+		res[i] = l.Name
 	}
 	return res
 }