day5 multi nodes finish main func & add a auto start shell script

geektutu · Feb 5, 2020 · f0e86d4 · f0e86d4
1 parent 7292c4a
commit f0e86d4
Show file tree

Hide file tree

Showing 16 changed files with 169 additions and 69 deletions.
diff --git a/gee-cache/day2-single-node/geecache/geecache.go b/gee-cache/day2-single-node/geecache/geecache.go
@@ -1,6 +1,10 @@
 package geecache
 
-import "sync"
+import (
+	"fmt"
+	"log"
+	"sync"
+)
 
 // A Group is a cache namespace and associated data loaded spread over
 type Group struct {
@@ -54,7 +58,12 @@ func GetGroup(name string) *Group {
 
 // Get value for a key from cache
 func (g *Group) Get(key string) (ByteView, error) {
+	if key == "" {
+		return ByteView{}, fmt.Errorf("key is required")
+	}
+
 	if v, ok := g.mainCache.get(key); ok {
+		log.Println("[GeeCache] hit")
 		return v, nil
 	}
 

diff --git a/gee-cache/day2-single-node/geecache/geecache_test.go b/gee-cache/day2-single-node/geecache/geecache_test.go
@@ -15,7 +15,7 @@ var db = map[string]string{
 func TestGet(t *testing.T) {
 	gee := NewGroup("scores", 2<<10, GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day3-http-server/geecache/geecache.go b/gee-cache/day3-http-server/geecache/geecache.go
@@ -1,6 +1,10 @@
 package geecache
 
-import "sync"
+import (
+	"fmt"
+	"log"
+	"sync"
+)
 
 // A Group is a cache namespace and associated data loaded spread over
 type Group struct {
@@ -54,7 +58,12 @@ func GetGroup(name string) *Group {
 
 // Get value for a key from cache
 func (g *Group) Get(key string) (ByteView, error) {
+	if key == "" {
+		return ByteView{}, fmt.Errorf("key is required")
+	}
+
 	if v, ok := g.mainCache.get(key); ok {
+		log.Println("[GeeCache] hit")
 		return v, nil
 	}
 

diff --git a/gee-cache/day3-http-server/geecache/geecache_test.go b/gee-cache/day3-http-server/geecache/geecache_test.go
@@ -15,7 +15,7 @@ var db = map[string]string{
 func TestGet(t *testing.T) {
 	gee := NewGroup("scores", 2<<10, GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day3-http-server/geecache/http.go b/gee-cache/day3-http-server/geecache/http.go
@@ -1,6 +1,7 @@
 package geecache
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"strings"
@@ -23,12 +24,17 @@ func NewHTTPPool(self string) *HTTPPool {
 	}
 }
 
+// Log info with server name
+func (p *HTTPPool) Log(format string, v ...interface{}) {
+	log.Printf("[Server %s] %s", p.self, fmt.Sprintf(format, v...))
+}
+
 // ServeHTTP handle all http requests
 func (p *HTTPPool) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if !strings.HasPrefix(r.URL.Path, p.basePath) {
 		panic("HTTPPool serving unexpected path: " + r.URL.Path)
 	}
-	log.Println("[geecache server]", r.Method, r.URL.Path)
+	p.Log("%s %s", r.Method, r.URL.Path)
 	// /<basepath>/<groupname>/<key> required
 	parts := strings.SplitN(r.URL.Path[len(p.basePath):], "/", 2)
 	if len(parts) != 2 {

diff --git a/gee-cache/day3-http-server/main.go b/gee-cache/day3-http-server/main.go
@@ -1,5 +1,13 @@
 package main
 
+/*
+$ curl http://localhost:9999/_geecache/scores/Tom
+630
+
+$ curl http://localhost:9999/_geecache/scores/kkk
+kkk not exist
+*/
+
 import (
 	"fmt"
 	"geecache"
@@ -16,7 +24,7 @@ var db = map[string]string{
 func main() {
 	geecache.NewGroup("scores", 2<<10, geecache.GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day4-consistent-hash/geecache/geecache.go b/gee-cache/day4-consistent-hash/geecache/geecache.go
@@ -1,6 +1,10 @@
 package geecache
 
-import "sync"
+import (
+	"fmt"
+	"log"
+	"sync"
+)
 
 // A Group is a cache namespace and associated data loaded spread over
 type Group struct {
@@ -54,7 +58,12 @@ func GetGroup(name string) *Group {
 
 // Get value for a key from cache
 func (g *Group) Get(key string) (ByteView, error) {
+	if key == "" {
+		return ByteView{}, fmt.Errorf("key is required")
+	}
+
 	if v, ok := g.mainCache.get(key); ok {
+		log.Println("[GeeCache] hit")
 		return v, nil
 	}
 

diff --git a/gee-cache/day4-consistent-hash/geecache/geecache_test.go b/gee-cache/day4-consistent-hash/geecache/geecache_test.go
@@ -15,7 +15,7 @@ var db = map[string]string{
 func TestGet(t *testing.T) {
 	gee := NewGroup("scores", 2<<10, GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day4-consistent-hash/geecache/http.go b/gee-cache/day4-consistent-hash/geecache/http.go
@@ -1,6 +1,7 @@
 package geecache
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"strings"
@@ -23,12 +24,17 @@ func NewHTTPPool(self string) *HTTPPool {
 	}
 }
 
+// Log info with server name
+func (p *HTTPPool) Log(format string, v ...interface{}) {
+	log.Printf("[Server %s] %s", p.self, fmt.Sprintf(format, v...))
+}
+
 // ServeHTTP handle all http requests
 func (p *HTTPPool) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if !strings.HasPrefix(r.URL.Path, p.basePath) {
 		panic("HTTPPool serving unexpected path: " + r.URL.Path)
 	}
-	log.Println("[geecache server]", r.Method, r.URL.Path)
+	p.Log("%s %s", r.Method, r.URL.Path)
 	// /<basepath>/<groupname>/<key> required
 	parts := strings.SplitN(r.URL.Path[len(p.basePath):], "/", 2)
 	if len(parts) != 2 {

diff --git a/gee-cache/day4-consistent-hash/main.go b/gee-cache/day4-consistent-hash/main.go
@@ -1,5 +1,13 @@
 package main
 
+/*
+$ curl http://localhost:9999/_geecache/scores/Tom
+630
+
+$ curl http://localhost:9999/_geecache/scores/kkk
+kkk not exist
+*/
+
 import (
 	"fmt"
 	"geecache"
@@ -16,7 +24,7 @@ var db = map[string]string{
 func main() {
 	geecache.NewGroup("scores", 2<<10, geecache.GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day5-multi-nodes/geecache/geecache.go b/gee-cache/day5-multi-nodes/geecache/geecache.go
@@ -1,6 +1,8 @@
 package geecache
 
 import (
+	"fmt"
+	"log"
 	"sync"
 )
 
@@ -10,7 +12,6 @@ type Group struct {
 	getter    Getter
 	mainCache cache
 	peers     PeerPicker
-	peersOnce sync.Once
 }
 
 // A Getter loads data for a key.
@@ -58,27 +59,39 @@ func GetGroup(name string) *Group {
 
 // Get value for a key from cache
 func (g *Group) Get(key string) (ByteView, error) {
-	g.peersOnce.Do(func() {
-		g.peers = getPeers()
-	})
+	if key == "" {
+		return ByteView{}, fmt.Errorf("key is required")
+	}
+
 	if v, ok := g.mainCache.get(key); ok {
+		log.Println("[GeeCache] hit")
 		return v, nil
 	}
 
 	return g.load(key)
 }
 
+// RegisterPeers registers a PeerPicker for choosing remote peer
+func (g *Group) RegisterPeers(peers PeerPicker) {
+	if g.peers != nil {
+		panic("RegisterPeerPicker called more than once")
+	}
+	g.peers = peers
+}
+
 func cloneBytes(b []byte) []byte {
 	c := make([]byte, len(b))
 	copy(c, b)
 	return c
 }
 
 func (g *Group) load(key string) (value ByteView, err error) {
-	if peer, ok := g.peers.PickPeer(key); ok {
-		value, err = g.getFromPeer(peer, key)
-		if err == nil {
-			return value, nil
+	if g.peers != nil {
+		if peer, ok := g.peers.PickPeer(key); ok {
+			if value, err = g.getFromPeer(peer, key); err == nil {
+				return value, nil
+			}
+			log.Println("[GeeCache] Failed to get from peer", err)
 		}
 	}
 

diff --git a/gee-cache/day5-multi-nodes/geecache/geecache_test.go b/gee-cache/day5-multi-nodes/geecache/geecache_test.go
@@ -15,7 +15,7 @@ var db = map[string]string{
 func TestGet(t *testing.T) {
 	gee := NewGroup("scores", 2<<10, GetterFunc(
 		func(key string) ([]byte, error) {
-			log.Println("[group scores] search key", key)
+			log.Println("[SlowDB] search key", key)
 			if v, ok := db[key]; ok {
 				return []byte(v), nil
 			}

diff --git a/gee-cache/day5-multi-nodes/geecache/http.go b/gee-cache/day5-multi-nodes/geecache/http.go
@@ -1,10 +1,9 @@
 package geecache
 
 import (
-	"bytes"
 	"fmt"
 	"geecache/consistenthash"
-	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -29,20 +28,23 @@ type HTTPPool struct {
 
 // NewHTTPPool initializes an HTTP pool of peers, and registers itself as a PeerPicker.
 func NewHTTPPool(self string) *HTTPPool {
-	p := &HTTPPool{
+	return &HTTPPool{
 		self:     self,
 		basePath: defaultBasePath,
 	}
-	RegisterPeerPicker(func() PeerPicker { return p })
-	return p
+}
+
+// Log info with server name
+func (p *HTTPPool) Log(format string, v ...interface{}) {
+	log.Printf("[Server %s] %s", p.self, fmt.Sprintf(format, v...))
 }
 
 // ServeHTTP handle all http requests
 func (p *HTTPPool) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if !strings.HasPrefix(r.URL.Path, p.basePath) {
 		panic("HTTPPool serving unexpected path: " + r.URL.Path)
 	}
-	log.Println("[geecache server]", r.Method, r.URL.Path)
+	p.Log("%s %s", r.Method, r.URL.Path)
 	// /<basepath>/<groupname>/<key> required
 	parts := strings.SplitN(r.URL.Path[len(p.basePath):], "/", 2)
 	if len(parts) != 2 {
@@ -86,6 +88,7 @@ func (p *HTTPPool) PickPeer(key string) (PeerGetter, bool) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	if peer := p.peers.Get(key); peer != "" && peer != p.self {
+		p.Log("Pick peer %s", peer)
 		return p.httpGetters[peer], true
 	}
 	return nil, false
@@ -97,10 +100,6 @@ type httpGetter struct {
 	baseURL string
 }
 
-var bufferPool = sync.Pool{
-	New: func() interface{} { return new(bytes.Buffer) },
-}
-
 func (h *httpGetter) Get(group string, key string) ([]byte, error) {
 	u := fmt.Sprintf(
 		"%v%v/%v",
@@ -118,17 +117,12 @@ func (h *httpGetter) Get(group string, key string) ([]byte, error) {
 		return nil, fmt.Errorf("server returned: %v", res.Status)
 	}
 
-	b := bufferPool.Get().(*bytes.Buffer)
-	b.Reset()
-	defer bufferPool.Put(b)
-
-	_, err = io.Copy(b, res.Body)
-
+	bytes, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, fmt.Errorf("reading response body: %v", err)
 	}
 
-	return b.Bytes(), nil
+	return bytes, nil
 }
 
 var _ PeerGetter = (*httpGetter)(nil)
diff --git a/gee-cache/day5-multi-nodes/geecache/peers.go b/gee-cache/day5-multi-nodes/geecache/peers.go
@@ -10,31 +10,3 @@ type PeerPicker interface {
 type PeerGetter interface {
 	Get(group string, key string) ([]byte, error)
 }
-
-// NoPeers is an implementation of PeerPicker that never finds a peer.
-type NoPeers struct{}
-
-// PickPeer return nothing
-func (NoPeers) PickPeer(key string) (peer PeerGetter, ok bool) { return }
-
-var portPicker func() PeerPicker
-
-// RegisterPeerPicker registers the peer initialization function.
-// It is called once, when the first group is created.
-func RegisterPeerPicker(fn func() PeerPicker) {
-	if portPicker != nil {
-		panic("RegisterPeerPicker called more than once")
-	}
-	portPicker = fn
-}
-
-func getPeers() PeerPicker {
-	if portPicker == nil {
-		return NoPeers{}
-	}
-	pk := portPicker()
-	if pk == nil {
-		pk = NoPeers{}
-	}
-	return pk
-}