From 27fdccc38040349125f0ab601870649a4c5d4e3e Mon Sep 17 00:00:00 2001
From: Helin Wang <ustc.harry@gmail.com>
Date: Fri, 19 May 2017 15:04:45 -0400
Subject: [PATCH] fix according to comments

---
 paddle/go/pserver/service.go      | 15 +++++----------
 paddle/go/pserver/service_test.go | 23 ++++++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/paddle/go/pserver/service.go b/paddle/go/pserver/service.go
index 47a862c5ad2..3bf26b7651e 100644
--- a/paddle/go/pserver/service.go
+++ b/paddle/go/pserver/service.go
@@ -9,8 +9,7 @@ import (
 // ElementType is the type of elements of a Parameter.
 type ElementType int
 
-var ErrUnintialized = errors.New("pserver not initialized")
-var ErrAlreadyIntialized = errors.New("pserver already initialized")
+var ErrAlreadyInitialized = errors.New("pserver already initialized")
 
 // Supported element types
 const (
@@ -56,7 +55,7 @@ func NewService() *Service {
 func (s *Service) BeginInitParams(config []byte, dummy *int) error {
 	select {
 	case <-s.initialized:
-		return ErrAlreadyIntialized
+		return ErrAlreadyInitialized
 	default:
 	}
 
@@ -75,7 +74,7 @@ func (s *Service) BeginInitParams(config []byte, dummy *int) error {
 func (s *Service) InitParam(paramWithConfigs ParameterWithConfig, dummy *int) error {
 	select {
 	case <-s.initialized:
-		return ErrAlreadyIntialized
+		return ErrAlreadyInitialized
 	default:
 	}
 
@@ -94,7 +93,7 @@ func (s *Service) InitParam(paramWithConfigs ParameterWithConfig, dummy *int) er
 func (s *Service) FinishInitParams(dummy0 int, dummy1 *int) error {
 	select {
 	case <-s.initialized:
-		return ErrAlreadyIntialized
+		return ErrAlreadyInitialized
 	default:
 	}
 
@@ -103,11 +102,7 @@ func (s *Service) FinishInitParams(dummy0 int, dummy1 *int) error {
 }
 
 func (s *Service) SendGrads(grads []Gradient, dummy *int) error {
-	select {
-	case <-s.initialized:
-	default:
-		return ErrUnintialized
-	}
+	<-s.initialized
 
 	count := len(grads)
 	if count == 0 {
diff --git a/paddle/go/pserver/service_test.go b/paddle/go/pserver/service_test.go
index 78dd4d6b58c..437d14b28c0 100644
--- a/paddle/go/pserver/service_test.go
+++ b/paddle/go/pserver/service_test.go
@@ -98,21 +98,12 @@ func TestMultipleInit(t *testing.T) {
 	}
 
 	err = s.FinishInitParams(0, &dummy)
-	if err != pserver.ErrAlreadyIntialized {
+	if err != pserver.ErrAlreadyInitialized {
 		t.FailNow()
 	}
 
 	err = s.BeginInitParams(nil, &dummy)
-	if err != pserver.ErrAlreadyIntialized {
-		t.FailNow()
-	}
-}
-
-func TestUninitialized(t *testing.T) {
-	s := pserver.NewService()
-	var dummy int
-	err := s.SendGrads(nil, &dummy)
-	if err != pserver.ErrUnintialized {
+	if err != pserver.ErrAlreadyInitialized {
 		t.FailNow()
 	}
 }
@@ -140,6 +131,16 @@ func TestBlockUntilInitialized(t *testing.T) {
 		wg.Done()
 	}()
 
+	wg.Add(1)
+	go func() {
+		var dummy int
+		err := s.SendGrads(nil, &dummy)
+		if err != nil {
+			t.FailNow()
+		}
+		wg.Done()
+	}()
+
 	var dummy int
 	err := s.BeginInitParams(nil, &dummy)
 	if err != nil {
-- 
GitLab