From e853f3e75fd6bdc39264ddf11e586726d35634dc Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <xuzhonghu@huawei.com>
Date: Mon, 13 Nov 2017 13:39:19 +0800
Subject: [PATCH] fix bug: without Unlock in error case, and remove unrelated
 test cases

---
 .../pkg/util/waitgroup/waitgroup.go           |   4 +-
 .../pkg/util/waitgroup/waitgroup_test.go      | 118 ------------------
 2 files changed, 2 insertions(+), 120 deletions(-)

diff --git a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go
index afe92fa83e1..488f563407d 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup.go
@@ -35,10 +35,10 @@ type SafeWaitGroup struct {
 // which prevent unsafe Add.
 func (wg *SafeWaitGroup) Add(delta int) error {
 	wg.mu.RLock()
+	defer wg.mu.RUnlock()
 	if wg.wait && delta > 0 {
-		return fmt.Errorf("Add with postive delta after Wait is forbidden")
+		return fmt.Errorf("add with postive delta after Wait is forbidden")
 	}
-	wg.mu.RUnlock()
 	wg.wg.Add(delta)
 	return nil
 }
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup_test.go b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup_test.go
index e1bbddd482f..b5b7557b856 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/waitgroup_test.go
@@ -18,8 +18,6 @@ limitations under the License.
 package waitgroup
 
 import (
-	"runtime"
-	"sync/atomic"
 	"testing"
 )
 
@@ -51,20 +49,6 @@ func TestWaitGroup(t *testing.T) {
 	}
 }
 
-func TestWaitGroupNegativeCounter(t *testing.T) {
-	defer func() {
-		err := recover()
-		if err != "sync: negative WaitGroup counter" {
-			t.Fatalf("Unexpected panic: %#v", err)
-		}
-	}()
-	wg := &SafeWaitGroup{}
-	wg.Add(1)
-	wg.Done()
-	wg.Done()
-	t.Fatal("Should panic")
-}
-
 func TestWaitGroupAddFail(t *testing.T) {
 	wg := &SafeWaitGroup{}
 	wg.Add(1)
@@ -74,105 +58,3 @@ func TestWaitGroupAddFail(t *testing.T) {
 		t.Errorf("Should return error when add positive after Wait")
 	}
 }
-
-func BenchmarkWaitGroupUncontended(b *testing.B) {
-	type PaddedWaitGroup struct {
-		SafeWaitGroup
-		pad [128]uint8
-	}
-	const CallsPerSched = 1000
-	procs := runtime.GOMAXPROCS(-1)
-	N := int32(b.N / CallsPerSched)
-	c := make(chan bool, procs)
-	for p := 0; p < procs; p++ {
-		go func() {
-			var wg PaddedWaitGroup
-			for atomic.AddInt32(&N, -1) >= 0 {
-				runtime.Gosched()
-				for g := 0; g < CallsPerSched; g++ {
-					wg.Add(1)
-					wg.Done()
-				}
-			}
-			c <- true
-		}()
-	}
-	for p := 0; p < procs; p++ {
-		<-c
-	}
-}
-
-func benchmarkWaitGroupAddDone(b *testing.B, localWork int) {
-	const CallsPerSched = 1000
-	procs := runtime.GOMAXPROCS(-1)
-	N := int32(b.N / CallsPerSched)
-	c := make(chan bool, procs)
-	var wg SafeWaitGroup
-	for p := 0; p < procs; p++ {
-		go func() {
-			foo := 0
-			for atomic.AddInt32(&N, -1) >= 0 {
-				runtime.Gosched()
-				for g := 0; g < CallsPerSched; g++ {
-					wg.Add(1)
-					for i := 0; i < localWork; i++ {
-						foo *= 2
-						foo /= 2
-					}
-					wg.Done()
-				}
-			}
-			c <- foo == 42
-		}()
-	}
-	for p := 0; p < procs; p++ {
-		<-c
-	}
-}
-
-func BenchmarkWaitGroupAddDone(b *testing.B) {
-	benchmarkWaitGroupAddDone(b, 0)
-}
-
-func BenchmarkWaitGroupAddDoneWork(b *testing.B) {
-	benchmarkWaitGroupAddDone(b, 100)
-}
-
-func benchmarkWaitGroupWait(b *testing.B, localWork int) {
-	const CallsPerSched = 1000
-	procs := runtime.GOMAXPROCS(-1)
-	N := int32(b.N / CallsPerSched)
-	c := make(chan bool, procs)
-	var wg SafeWaitGroup
-	wg.Add(procs)
-	for p := 0; p < procs; p++ {
-		go wg.Done()
-	}
-	for p := 0; p < procs; p++ {
-		go func() {
-			foo := 0
-			for atomic.AddInt32(&N, -1) >= 0 {
-				runtime.Gosched()
-				for g := 0; g < CallsPerSched; g++ {
-					wg.Wait()
-					for i := 0; i < localWork; i++ {
-						foo *= 2
-						foo /= 2
-					}
-				}
-			}
-			c <- foo == 42
-		}()
-	}
-	for p := 0; p < procs; p++ {
-		<-c
-	}
-}
-
-func BenchmarkWaitGroupWait(b *testing.B) {
-	benchmarkWaitGroupWait(b, 0)
-}
-
-func BenchmarkWaitGroupWaitWork(b *testing.B) {
-	benchmarkWaitGroupWait(b, 100)
-}