more tests

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

pkg/ring/replication_set.go

@@ -81,7 +81,7 @@ track:
 			tracker.done(res.instance, res.res, res.err)
 			if res.err != nil {
 				if tracker.failed() {
-					if !partialDataEnabled || tracker.failedInAllZones() {
+					if !partialDataEnabled || tracker.failedCompletely() {
 						return nil, res.err
 					}
 					trackerFailed = true

pkg/ring/replication_set_tracker.go

@@ -15,8 +15,8 @@ type replicationSetResultTracker interface {
 	// Returns list of instance addresses that failed
 	failedInstances() []string
 
-	// Returns true if executions failed in all zones. Only relevant for zoneAwareResultTracker.
-	failedInAllZones() bool
+	// Returns true if executions failed in all instances or all zones.
+	failedCompletely() bool
 
 	// Returns recorded results.
 	getResults() []interface{}
@@ -29,6 +29,7 @@ type defaultResultTracker struct {
 	maxErrors    int
 	failedInst   []string
 	results      []interface{}
+	numInstances int
 }
 
 func newDefaultResultTracker(instances []InstanceDesc, maxErrors int) *defaultResultTracker {
@@ -39,6 +40,7 @@ func newDefaultResultTracker(instances []InstanceDesc, maxErrors int) *defaultRe
 		maxErrors:    maxErrors,
 		failedInst:   make([]string, 0, len(instances)),
 		results:      make([]interface{}, 0, len(instances)),
+		numInstances: len(instances),
 	}
 }
 
@@ -60,8 +62,8 @@ func (t *defaultResultTracker) failed() bool {
 	return t.numErrors > t.maxErrors
 }
 
-func (t *defaultResultTracker) failedInAllZones() bool {
-	return false
+func (t *defaultResultTracker) failedCompletely() bool {
+	return t.numInstances == t.numErrors
 }
 
 func (t *defaultResultTracker) failedInstances() []string {
@@ -141,7 +143,7 @@ func (t *zoneAwareResultTracker) failed() bool {
 	return failedZones > t.maxUnavailableZones
 }
 
-func (t *zoneAwareResultTracker) failedInAllZones() bool {
+func (t *zoneAwareResultTracker) failedCompletely() bool {
 	failedZones := len(t.failuresByZone)
 	return failedZones == t.zoneCount
 }

pkg/ring/replication_set_tracker_test.go

@@ -154,6 +154,26 @@ func TestDefaultResultTracker(t *testing.T) {
 				assert.Equal(t, []interface{}{[]int{1, 1, 1}, []int{2, 2, 2}, []int{3, 3, 3}}, tracker.getResults())
 			},
 		},
+		"failedCompletely should return true only if all instances have failed, regardless of max errors": {
+			instances: []InstanceDesc{instance1, instance2, instance3},
+			maxErrors: 1,
+			run: func(t *testing.T, tracker *defaultResultTracker) {
+				tracker.done(&instance1, nil, errors.New("test"))
+				assert.False(t, tracker.succeeded())
+				assert.False(t, tracker.failed())
+				assert.False(t, tracker.failedCompletely())
+
+				tracker.done(&instance2, nil, errors.New("test"))
+				assert.False(t, tracker.succeeded())
+				assert.True(t, tracker.failed())
+				assert.False(t, tracker.failedCompletely())
+
+				tracker.done(&instance3, nil, errors.New("test"))
+				assert.False(t, tracker.succeeded())
+				assert.True(t, tracker.failed())
+				assert.True(t, tracker.failedCompletely())
+			},
+		},
 		"failedInstances should work": {
 			instances: []InstanceDesc{instance1, instance2},
 			maxErrors: 2,
@@ -410,27 +430,27 @@ func TestZoneAwareResultTracker(t *testing.T) {
 				assert.False(t, tracker.failed())
 			},
 		},
-		"failInAllZones should return true only if all zones have failed, regardless of max unavailable zones": {
+		"failedCompletely should return true only if all zones have failed, regardless of max unavailable zones": {
 			instances:           []InstanceDesc{instance1, instance2, instance3, instance4, instance5, instance6},
 			maxUnavailableZones: 1,
 			run: func(t *testing.T, tracker *zoneAwareResultTracker) {
 				// Zone-a
 				tracker.done(&instance1, nil, errors.New("test"))
 				assert.False(t, tracker.succeeded())
 				assert.False(t, tracker.failed())
-				assert.False(t, tracker.failedInAllZones())
+				assert.False(t, tracker.failedCompletely())
 
 				// Zone-b
 				tracker.done(&instance3, nil, errors.New("test"))
 				assert.False(t, tracker.succeeded())
 				assert.True(t, tracker.failed())
-				assert.False(t, tracker.failedInAllZones())
+				assert.False(t, tracker.failedCompletely())
 
 				// Zone-c
 				tracker.done(&instance5, nil, errors.New("test"))
 				assert.False(t, tracker.succeeded())
 				assert.True(t, tracker.failed())
-				assert.True(t, tracker.failedInAllZones())
+				assert.True(t, tracker.failedCompletely())
 			},
 		},
 		"failedInstances should work": {